Merge pull request #301 from ec-jrc/develop

Re3gistry2 2.5.0 version release

dist/webapp/public_html/conf/conf.js

@@ -4,21 +4,17 @@
 
 var registryApp = {};
 
-// The default language of the app (used as a fallback if the language is not
+// The default language of the app (used as a fallback if the language is not 
 // passed by URL or cannot be retrieved by Browser language)
 registryApp.defaultLanguage = 'en';
 
 // Search maximum results per page
 registryApp.maxSearchResultsPerPage = 10;
 
 // Force http URIs (even if the original call has https URIs)
-registryApp.forceHttpURIs = true;
+registryApp.forceHttpURIs=true;
 
-// Default Error message parameters (Change if needed to your own repository or link)
-registryApp.errorMessageDefinition = "Re3gistry Software repository";
-registryApp.errorMessageURL = "https://github.com/ec-jrc/re3gistry";
-
-// The app's base URLs
+// The app's base URL
 registryApp.domainURL = '//registry-test.eu';
 registryApp.hostURL = '//registry-test.eu/registry';
 registryApp.searchURL = '//registry-test.eu/registry/search';

documentation/administrator-manual.md

@@ -194,6 +194,17 @@ The software has an engine that automatically creates the cache for all the elem
 curl --noproxy localhost -i -X GET http://localhost:8080/re3gistry2restapi/cacheall
 ```
 
+### Swagger OpenAPI interactive UI
+
+To access the swagger openapi interactive interface you will have to change the parameters
+found in the [docker-compose](https://github.com/ec-jrc/re3gistry/blob/develop/sources/Re3gistry2-build-helper/docker-compose.yml) file. The default value and ports for the UI are
+localhost:8082.
+
+The frontend and backend interfaces both have a "Access API" hyperlink on the footer element. These links point to the default swagger URL, you might have to change it afterwards.
+
+You can manually add, edit and remove some of the options of the openapi interface by editing
+the existing [openapi.json](https://github.com/ec-jrc/re3gistry/blob/develop/sources/Re3gistry2-build-helper/swagger/openapi.json) file.
+
 ### Changing error messages
 
 You can change how the error messages are shown in your Re3gistry local instance.

sources/Re3gistry2-build-helper/docker-compose.yml

@@ -23,7 +23,7 @@ services:
           # Test database to use it without installation
           # Be sure file sources-main/resources-configurations_files/system.installed
           #  is removed from the war file. If not, installation will be not detected.
-          - ../../dist/customize-interface/example-profile-developer-docker/dump-docker-202205180929.sql:/docker-entrypoint-initdb.d/init_backup.sql
+          # - ../../dist/customize-interface/example-profile-developer-docker/dump-docker-202205180929.sql:/docker-entrypoint-initdb.d/init_backup.sql
           # login example db: [email protected] password
         expose: 
           - "5432"
@@ -91,6 +91,17 @@ services:
       ports:
         - 2500:2500
         - 8081:8080 # http://localhost:8081/
-        - 8085:8085
+        - 8085:8085 
+
+    swagger-ui:
+      image: swaggerapi/swagger-ui
+      container_name: "swagger-ui"
+      ports:
+        - "8082:8080"
+      volumes:
+        - ./swagger/openapi.json:/openapi.json
+      environment:
+        SWAGGER_JSON: /openapi.json
+        # API_URL: ""
 networks:
   main:

sources/Re3gistry2-build-helper/pom.xml

@@ -145,4 +145,4 @@
             </properties>
         </profile>     
     </profiles>
-</project>
+</project>