deployment update

deployment/.env

@@ -4,12 +4,12 @@ DEPLOY_USER=1000
 DEPLOY_GROUP=1000
 #version selections
 PROXY_TAG=mainline-alpine
-MAIN_APP_TAG=2.1.3
+MAIN_APP_TAG=2.1.8
-NOTIFICATION_APP_TAG=2.1.3
+NOTIFICATION_APP_TAG=2.1.7
-ANNOTATION_APP_TAG=2.1.3
+ANNOTATION_APP_TAG=2.1.7
-DOCX_APP_TAG=0.0.8
+DOCX_APP_TAG=0.0.12
-JSON_APP_TAG=0.0.6
+JSON_APP_TAG=0.0.8
-ZENODO_APP_TAG=2.0.4
+ZENODO_APP_TAG=2.0.8
 POSTGRES_TAG=16-alpine
 ELK_TAG=8.13.0
 KEYCLOAK_TAG=24.0.2
@@ -23,5 +23,4 @@ PROFILE=test
 #port speficiations
 SERVER_PORT=8080
 PROXY_APP_PORT=8081
-PROXY_MS_PORT=8082
 POSTGRES_PORT=5432

deployment/docker-compose.override.yml

@@ -1,105 +1,104 @@
 services:
 ############################## PROXY ########################################
-  opendmp.proxy:
+  opencdmp.proxy:
     restart: unless-stopped
     cpus: 1
     mem_limit: 256m
     ports:
       - "${PROXY_APP_PORT}:8081"
-      - "${PROXY_MS_PORT}:8082"
+    # env_file:
-    env_file:
+    #   - ./proxy/proxy.env
-      - ./proxy/proxy.env
     volumes:
       - ./proxy/nginx.conf:/etc/nginx/nginx.conf
       - ./proxy/ProxyNginx.conf:/etc/nginx/conf.d/default.conf
       - ./logs/proxy:/tmp/logs
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
 
 ############################## OPENDMP APP #################################
-  opendmp.backend:
+  opencdmp.backend:
     restart: unless-stopped
     cpus: 1
     mem_limit: 2048m
     environment:
       - PROFILE=${PROFILE}
     ports:
-      - "8080"
+      - "0.0.0.0:50030:8080"
     volumes:
-      - ./opendmp/backend/config:/config
+      - ./opencdmp/backend/config:/config
-      - ./opendmp/backend/certificates:/certificates
+      - ./opencdmp/backend/certificates:/certificates
-      - ./opendmp/backend/i18n:/i18n
+      - ./opencdmp/backend/i18n:/i18n
-      - ./opendmp/backend/material:/material
+      - ./opencdmp/backend/material:/material
-      - ./opendmp/backend/Semantics.json:/Semantics.json
+      - ./opencdmp/backend/Semantics.json:/Semantics.json
-      - ./storage/opendmp/backend:/storage
+      - ./storage/opencdmp/backend:/storage
-      - ./logs/opendmp/backend:/logs
+      - ./logs/opencdmp/backend:/logs
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
-      - opendmp-backend-network
+      - opencdmp-backend-network
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
-      - opendmp-gotenberg-shared-network
+      - opencdmp-gotenberg-shared-network
-      - opendmp-elastic-shared-network
+      - opencdmp-elastic-shared-network
-      - opendmp-keycloak-shared-network
+      - opencdmp-keycloak-shared-network
-      - opendmp-postgres-shared-network
+      - opencdmp-postgres-shared-network
-      - opendmp-rabbitmq-shared-network
+      - opencdmp-rabbitmq-shared-network
 
-  opendmp.frontend:
+  opencdmp.frontend:
     restart: unless-stopped
     cpus: 1
     mem_limit: 2048m
     ports:
-      - "8080"
+      - "0.0.0.0:50031:8080"
     volumes:
-      - ./opendmp/frontend/config.json:/usr/share/nginx/html/assets/config/config.json
+      - ./opencdmp/frontend/config.json:/usr/share/nginx/html/assets/config/config.json
-      - ./opendmp/frontend/nginx.conf:/etc/nginx/nginx.conf
+      - ./opencdmp/frontend/nginx.conf:/etc/nginx/nginx.conf
-      - ./opendmp/frontend/WebAppNginx.conf:/etc/nginx/conf.d/default.conf
+      - ./opencdmp/frontend/WebAppNginx.conf:/etc/nginx/conf.d/default.conf
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
 
-  opendmp.notification:
+  opencdmp.notification:
     cpus: 1
     mem_limit: 1024m
     restart: unless-stopped
     ports:
-      - "8080"
+      - "0.0.0.0:50036:8080"
     environment:
       - PROFILE=${PROFILE}
     volumes:
-      - ./opendmp/notification/config:/config
+      - ./opencdmp/notification/config:/config
-      - ./opendmp/notification/messages:/messages
+      - ./opencdmp/notification/messages:/messages
-      - ./opendmp/notification/notification_templates:/notification_templates
+      - ./opencdmp/notification/notification_templates:/notification_templates
-      - ./logs/opendmp/notification-api:/logs
+      - ./logs/opencdmp/notification:/logs
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
-      - opendmp-backend-network
+      - opencdmp-backend-network
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
-      - opendmp-rabbitmq-shared-network
+      - opencdmp-rabbitmq-shared-network
-      - opendmp-keycloak-shared-network
+      - opencdmp-keycloak-shared-network
-      - opendmp-postgres-shared-network
+      - opencdmp-postgres-shared-network
 
-  opendmp.annotation:
+  opencdmp.annotation:
     cpus: 1
     mem_limit: 1024m
     restart: unless-stopped
     ports:
-      - "8080"
+      - "0.0.0.0:50035:8080"
     environment:
       - PROFILE=${PROFILE}
     volumes:
-      - ./opendmp/annotation/config:/config
+      - ./opencdmp/annotation/config:/config
-      - ./opendmp/annotation/messages:/messages
+      - ./opencdmp/annotation/messages:/messages
-      - ./logs/opendmp/annotation-api:/logs
+      - ./logs/opencdmp/annotation:/logs
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
-      - opendmp-backend-network
+      - opencdmp-backend-network
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
-      - opendmp-rabbitmq-shared-network
+      - opencdmp-rabbitmq-shared-network
-      - opendmp-keycloak-shared-network
+      - opencdmp-keycloak-shared-network
-      - opendmp-postgres-shared-network
+      - opencdmp-postgres-shared-network
 
-# ############################## FILE-TRANSFORMER #################################
+# # ############################## FILE-TRANSFORMER #################################
 
-  opendmp.file.transformer.docx:
+  opencdmp.file.transformer.docx:
     restart: unless-stopped
     cpus: 1
     mem_limit: 1024m
@@ -109,15 +108,15 @@ services:
       - SERVER_PORT=${SERVER_PORT}
       - PROFILE=${PROFILE}
     volumes:
-      - ./opendmp/file-transformer-docx/config:/config
+      - ./opencdmp/file-transformer-docx/config:/config
-      - ./logs/opendmp/file-transformer-docx:/logs
+      - ./logs/opencdmp/file-transformer-docx:/logs
-      - ./storage/opendmp/file-transformer-docx:/storage
+      - ./storage/opencdmp/file-transformer-docx:/storage
     networks:
-      - opendmp-backend-network
+      - opencdmp-backend-network
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
-      - opendmp-gotenberg-shared-network
+      - opencdmp-gotenberg-shared-network
 
-  opendmp.file.transformer.rdajson:
+  opencdmp.file.transformer.rdajson:
     restart: unless-stopped
     cpus: 1
     mem_limit: 1024m
@@ -127,16 +126,16 @@ services:
       - SERVER_PORT=${SERVER_PORT}
       - PROFILE=${PROFILE}
     volumes:
-      - ./opendmp/file-transformer-rda-json/config:/config
+      - ./opencdmp/file-transformer-rda-json/config:/config
-      - ./opendmp/file-transformer-rda-json/internal:/internal
+      - ./opencdmp/file-transformer-rda-json/internal:/internal
-      - ./logs/opendmp/file-transformer-rda-json:/logs
+      - ./logs/opencdmp/file-transformer-rda-json:/logs
-      - ./storage/opendmp/file-transformer-rda-json:/storage
+      - ./storage/opencdmp/file-transformer-rda-json:/storage
     networks:
-      - opendmp-backend-network
+      - opencdmp-backend-network
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
 
-############################## ZENODO #######################################
+# ############################## ZENODO #######################################
-  opendmp.zenodo:
+  opencdmp.zenodo:
     restart: unless-stopped
     cpus: 1
     mem_limit: 1024m
@@ -145,44 +144,43 @@ services:
     environment:
       - PROFILE=${PROFILE}
     volumes:
-      - ./opendmp/zenodo/config:/config
+      - ./opencdmp/zenodo/config:/config
-      - ./opendmp/zenodo/zenodo.jpg:/zenodo.jpg
+      - ./opencdmp/zenodo/zenodo.jpg:/zenodo.jpg
-      - ./storage/opendmp/zenodo:/storage
+      - ./storage/opencdmp/zenodo:/storage
-      - ./logs/opendmp/zenodo:/logs
+      - ./logs/opencdmp/zenodo:/logs
     networks:
-      - opendmp-plugins-network
+      - opencdmp-plugins-network
-      - opendmp-keycloak-shared-network
+      - opencdmp-keycloak-shared-network
 
 ############################## POSTGRES 16 #################################
 
-  opendmp.postgres:
+  # opencdmp.postgres:
-      restart: unless-stopped
+  #     restart: unless-stopped
-      mem_limit: 2048M
+  #     mem_limit: 2048M
-      ports:
+  #     ports:
-        # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only
+  #       # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only
-        - "${POSTGRES_PORT}:5432"
+  #       - "${POSTGRES_PORT}:5432"
-      env_file:
+  #     env_file:
-        - ./postgres/postgres.env
+  #       - ./postgres/postgres.env
-      volumes:
+  #     volumes:
-        - ./storage/postgres/data:/var/lib/postgresql/data
+  #       - ./storage/postgres/data:/var/lib/postgresql/data
-        - ./postgres/opendmp_init.sql:/docker-entrypoint-initdb.d/opendmp_init.sql
+  #       - ./postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql
-        - ./postgres/user_init.sql:/docker-entrypoint-initdb.d/user_init.sql
+  #     networks:
-      networks:
+  #       - opencdmp-postgres-shared-network
-        - opendmp-postgres-shared-network
+  #     healthcheck:
-      healthcheck:
+  #       test: ["CMD-SHELL", "sh -c 'pg_isready -U postgres -d opencdmp'"]
-        test: ["CMD-SHELL", "sh -c 'pg_isready -U opendmp-psql -d opendmp'"]
+  #       interval: 15s
-        interval: 15s
+  #       timeout: 60s
-        timeout: 60s
+  #       retries: 5 
-        retries: 5 
 
 
 ################################# ELASTICSEARCH #################################################
-  opendmp.elasticsearch:
+  opencdmp.elasticsearch:
     restart: unless-stopped
     cpus: 2
     mem_limit: 1024m
     env_file:
-      - elk/elk.env
+      - ./elk/elk.env
     environment:
       ES_JAVA_OPTS: -Xmx512m -Xms512m
     ulimits:
@@ -200,7 +198,7 @@ services:
       - "9200"
       - "9300"
     networks:
-      - opendmp-elastic-shared-network
+      - opencdmp-elastic-shared-network
     healthcheck:
       test: curl -s http://localhost:9200 >/dev/null; if [[ $$? == 52 ]]; then echo 0; else echo 1; fi
       interval: 30s
@@ -208,27 +206,27 @@ services:
       retries: 5
 
 ############################## KEYCLOAK ###############################################
-  # opendmp.keycloak:
+  # opencdmp.keycloak:
   #   restart: unless-stopped
   #   command: ["start-dev", "--log=console,file", "--log-file=/tmp/logs/keycloak.log", "--import-realm"]
   #   cpus: 2
   #   mem_limit: 2048M
   #   env_file:
-  #     - keycloak/keycloak.env
+  #     - ./keycloak/keycloak.env
   #   environment:
   #     - JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true"
   #   volumes:
   #     - ./logs/keycloak:/tmp/logs
-  #     - ./keycloak/imports/opendmp-realm.json:/opt/keycloak/data/import/opendmp-realm.json
+  #     - ./keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json
   #   expose:
   #     - "8080"
   #   networks:
-  #     - opendmp-proxy-network
+  #     - opencdmp-proxy-network
-  #     - opendmp-postgres-shared-network
+  #     - opencdmp-postgres-shared-network
-  #     - opendmp-keycloak-shared-network
+  #     - opencdmp-keycloak-shared-network
 
 ############################## RABBITMQ ###############################################
-  opendmp.rabbitmq:
+  opencdmp.rabbitmq:
     labels:
       NAME: "rabbitmq"
     cpus: 1
@@ -238,15 +236,15 @@ services:
       - "0.0.0.0:15672:15672"
       - "0.0.0.0:5672:5672"
     env_file:
-      - rabbitmq/rabbitmq.env
+      - ./rabbitmq/rabbitmq.env
     volumes:
      - /rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro
     networks:
-      - opendmp-proxy-network
+      - opencdmp-proxy-network
-      - opendmp-rabbitmq-shared-network
+      - opencdmp-rabbitmq-shared-network
 
 ############################## GOTENBERG ##############################################
-  opendmp.gotenberg:
+  opencdmp.gotenberg:
     cpus: 2
     mem_limit: 2048m
     restart: unless-stopped
@@ -254,29 +252,29 @@ services:
      - "3000"
     hostname: gotenberg
     env_file:
-      - gotenberg/gotenberg.env
+      - ./gotenberg/gotenberg.env
     networks:
-      - opendmp-gotenberg-shared-network
+      - opencdmp-gotenberg-shared-network
 
 networks:
-  opendmp-proxy-network:
+  opencdmp-proxy-network:
-    name:  opendmp-proxy-network
+    name:  opencdmp-proxy-network
-  opendmp-backend-network:
+  opencdmp-backend-network:
-    name: opendmp-backend-network
+    name: opencdmp-backend-network
-  opendmp-plugins-network:
+  opencdmp-plugins-network:
-    name: opendmp-plugins-network
+    name: opencdmp-plugins-network
-  opendmp-keycloak-shared-network:
+  opencdmp-keycloak-shared-network:
     external: true
-    name: opendmp-keycloak-shared-network
+    name: opencdmp-keycloak-shared-network
-  opendmp-gotenberg-shared-network:
+  opencdmp-gotenberg-shared-network:
     external: true
-    name: opendmp-gotenberg-shared-network
+    name: opencdmp-gotenberg-shared-network
-  opendmp-rabbitmq-shared-network:
+  opencdmp-rabbitmq-shared-network:
     external: true
-    name: opendmp-rabbitmq-shared-network
+    name: opencdmp-rabbitmq-shared-network
-  opendmp-elastic-shared-network:
+  opencdmp-elastic-shared-network:
     external: true
-    name: opendmp-elastic-shared-network
+    name: opencdmp-elastic-shared-network
-  opendmp-postgres-shared-network:
+  opencdmp-postgres-shared-network:
     external: true
-    name: opendmp-postgres-shared-network
+    name: opencdmp-postgres-shared-network

deployment/docker-compose.yml

@@ -1,84 +1,88 @@
 services:
 ############################## PROXY ########################################
-  opendmp.proxy:
+  opencdmp.proxy:
-      container_name: opendmp.proxy
+      container_name: opencdmp.proxy
       image: nginx:${PROXY_TAG}
-      # depends_on:
+      depends_on:
-      #   - opendmp.keycloak
+        - opencdmp.frontend
+        - opencdmp.backend
+        - opencdmp.notification
+        - opencdmp.annotation
+        # - opencdmp.keycloak
 
 ############################## OPENDMP APP #################################
 
-  opendmp.frontend:
+  opencdmp.frontend:
-    container_name: opendmp.frontend
+    container_name: opencdmp.frontend
     image: ${DOCKER_REGISTRY}open-dmp-webapp:${MAIN_APP_TAG}
     depends_on:
-      - opendmp.backend
+      - opencdmp.backend
-      - opendmp.notification
+      - opencdmp.notification
-      - opendmp.annotation
+      - opencdmp.annotation
 
-  opendmp.backend:
+  opencdmp.backend:
-    container_name: opendmp.backend
+    container_name: opencdmp.backend
     image: ${DOCKER_REGISTRY}open-dmp-api:${MAIN_APP_TAG}
-    depends_on:
+    # depends_on:
-      - opendmp.postgres
+    #   - opencdmp.postgres
 
-  opendmp.notification:
+  opencdmp.notification:
-    container_name: opendmp.notification
+    container_name: opencdmp.notification
     image: ${DOCKER_REGISTRY}open-dmp-notification-api:${NOTIFICATION_APP_TAG}
-    depends_on:
+    # depends_on:
-      - opendmp.postgres
+    #   - opencdmp.postgres
 
-  opendmp.annotation:
+  opencdmp.annotation:
-    container_name: opendmp.annotation
+    container_name: opencdmp.annotation
     image: ${DOCKER_REGISTRY}open-dmp-annotation-api:${ANNOTATION_APP_TAG}
-    depends_on:
+    # depends_on:
-      - opendmp.postgres
+    #   - opencdmp.postgres
 
-# ############################## FILE-TRANSFORMERS #######################################
+# # ############################## FILE-TRANSFORMERS #######################################
 
-  opendmp.file.transformer.docx:
+  opencdmp.file.transformer.docx:
-    container_name: opendmp.file.transformer.docx
+    container_name: opencdmp.file.transformer.docx
     image: ${DOCKER_REGISTRY}file-transformation-docx-api:${DOCX_APP_TAG}
     depends_on:
-      - opendmp.backend
+      - opencdmp.backend
 
-  opendmp.file.transformer.rdajson:
+  opencdmp.file.transformer.rdajson:
-    container_name: opendmp.file.transformer.rdajson
+    container_name: opencdmp.file.transformer.rdajson
     image: ${DOCKER_REGISTRY}file-transformation-rda-json-api:${JSON_APP_TAG}
     depends_on:
-      - opendmp.backend
+      - opencdmp.backend
 
-################################ ZENODO ###############################################
+# ################################ ZENODO ###############################################
-  opendmp.zenodo:
+  opencdmp.zenodo:
-    container_name: opendmp.zenodo
+    container_name: opencdmp.zenodo
     image: ${DOCKER_REGISTRY}repository-deposit-zenodo:${ZENODO_APP_TAG}
     depends_on:
-      - opendmp.backend
+      - opencdmp.backend
 
 ############################## POSTGRES 16 ############################################
-  opendmp.postgres:
+  # opencdmp.postgres:
-    container_name: opendmp.postgres
+  #   container_name: opencdmp.postgres
-    image: postgres:${POSTGRES_TAG}
+  #   image: postgres:${POSTGRES_TAG}
 
 ################################# ELASTICSEARCH #################################################
-  opendmp.elasticsearch:
+  opencdmp.elasticsearch:
-    container_name: opendmp.elasticsearch
+    container_name: opencdmp.elasticsearch
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELK_TAG}
 
 ############################## KEYCLOAK ###############################################
-  # opendmp.keycloak:
+  # opencdmp.keycloak:
-  #   container_name: opendmp.keycloak
+  #   container_name: opencdmp.keycloak
   #   image: quay.io/keycloak/keycloak:${KEYCLOAK_TAG}
   #   depends_on:
-  #     opendmp.postgres:
+  #     opencdmp.postgres:
   #       condition: service_healthy
 
 ############################## RABBITMQ ###############################################
-  opendmp.rabbitmq:
+  opencdmp.rabbitmq:
-    container_name: opendmp.rabbitmq
+    container_name: opencdmp.rabbitmq
     image: rabbitmq:${RABBITMQ_TAG}
 
 ############################## GOTENBERG ##############################################
-  opendmp.gotenberg:
+  opencdmp.gotenberg:
     image: gotenberg/gotenberg:${GOTENBERG_TAG}
-    container_name: opendmp.gotenberg
+    container_name: opencdmp.gotenberg

deployment/elk/elasticsearch/elasticsearch.yml

@@ -1,5 +1,5 @@
 ---
-cluster.name: opendmp-cluster
+cluster.name: opencdmp-cluster
 network.host: 0.0.0.0
 
 discovery.type: single-node

deployment/elk/elasticsearch/index_init.sh

@@ -34,17 +34,17 @@ curl -XPUT "http://localhost:9200/descriptions" -u elastic:elastic -H 'Content-T
   }
 }'
 
-curl -XPOST "localhost:9200/_security/role/opendmp-api-test" -u elastic:elastic -H 'Content-Type: application/json' -d '{
+curl -XPOST "localhost:9200/_security/role/opencdmp-api-test" -u elastic:elastic -H 'Content-Type: application/json' -d '{
   "indices": [
     {
-      "names": [ "opendmp-*-test" ],
+      "names": [ "opencdmp-*-test" ],
       "privileges": [ "all" ]
     }
   ]
 }'
 
-curl -XPOST "localhost:9200/_security/user/opendmp-api-test?pretty" -u elastic:elastic -H 'Content-Type: application/json' -d'
+curl -XPOST "localhost:9200/_security/user/opencdmp-api-test?pretty" -u elastic:elastic -H 'Content-Type: application/json' -d'
 {
   "password" : "your_password_here",
-  "roles" : [ "opendmp-api-test" ]
+  "roles" : [ "opencdmp-api-test" ]
 }'

deployment/keycloak/imports/opencdmp-realm.jsonZone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=http://host.docker.internal:8081/keycloak

deployment/keycloak/keycloak.env

@@ -1,18 +1,18 @@
 ##################### KEYCLOAK #########################
 # DB related configuraation
 KC_DB=postgres
-KC_DB_URL_HOST=opendmp.postgres
+KC_DB_URL_HOST=opencdmp.postgres
 KC_DB_SCHEMA=public
 KC_DB_URL_DATABASE=keycloak
 KC_DB_PORT=5432
-KC_DB_USERNAME=keycloak-psql
+KC_DB_USERNAME=postgres
-KC_DB_PASSWORD=keycloak-admin
+KC_DB_PASSWORD=postgres-admin
 
 #Keycloak related configuration
 KEYCLOAK_ADMIN=keycloak-admin
 KEYCLOAK_ADMIN_PASSWORD=admin
-KC_HOSTNAME_URL=http://localhost:8082/keycloak
+KC_HOSTNAME_URL=http://host.docker.internal:8081/keycloak
-KC_HOSTNAME_ADMIN_URL=http://localhost:8082/keycloak
+KC_HOSTNAME_ADMIN_URL=http://host.docker.internal:8081/keycloak
 KC_HTTP_RELATIVE_PATH=/keycloak
 KC_PROXY_HEADERS=xforwarded
 KC_HOSTNAME_STRICT_HTTPS=false

deployment/opencdmp/annotation/config/app.env

@@ -1,7 +1,7 @@
 #DB
-DB_CONNECTION_STRING=jdbc:postgresql://opendmp.postgres:5432/opendmp
+DB_CONNECTION_STRING=jdbc:postgresql://opencdmp.postgres:5432/opencdmp
-DB_USER=opendmp-psql
+DB_USER=postgres
-DB_PASSWORD=opendmp-admin
+DB_PASSWORD=postgres-admin
 
 #Server
 WEB_PORT=8087
@@ -14,11 +14,11 @@ IDP_APIKEY_SCOPE=dmp_annotation-dedicated
 IDP_OPAQUE_CLIENT_ID=
 IDP_OPAQUE_CLIENT_SECRET=
 
-IDP_ISSUER_URI=http://localhost:8082/keycloak/realms/OpenDMP
+IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
-QUEUE_APP_ID=opendmp-annotation-staging
+QUEUE_APP_ID=opencdmp-annotation-dev
 
 #RABBITMQ
-RABBIT_HOST=opendmp.rabbitmq
+RABBIT_HOST=opencdmp.rabbitmq
 RABBIT_PORT=5672
 RABBIT_USER=guest
 RABBIT_PASS=guest

deployment/opencdmp/annotation/config/cors-test.yml

@@ -0,0 +1,3 @@
+web:
+  cors:
+    allowed-origins: [ http://host.docker.internal:8081 ]

deployment/opencdmp/backend/config/app.env

@@ -0,0 +1,57 @@
+#DB
+DB_URL=jdbc:postgresql://opencdmp.postgres:5432/opencdmp
+DB_USER=postgres
+DB_PASS=postgres-admin
+
+#ELASTICSEARCH
+ELASTIC_ENABLED=true
+ELASTIC_USE_SSL=false
+ELASTIC_HOST=opencdmp.elasticsearch:9200
+ELASTIC_USER= opencdmp-api-test
+ELASTIC_PASS=your_password_here
+ELASTIC_DMP_INDEX=plans
+ELASTIC_DESCRIPTION_INDEX=descriptions
+
+#SERVER
+WEB_PORT=8081
+
+#GOTENBERG
+PDF_CONVERTER_URL=http://opencdmp.gotenberg:3000/
+
+#STORAGE
+FILE_STORAGE=/storage
+
+#RABBITMQ
+RABBIT_HOST=opencdmp.rabbitmq
+RABBIT_PORT=5672
+RABBIT_USER=guest
+RABBIT_PASS=guest
+
+#KEYCLOAK
+KEYCLOAK_API_SERVER_URL=http://host.docker.internal:8081/keycloak
+KEYCLOAK_API_REALM=OpenCDMP
+KEYCLOAK_API_USERNAME=keycloak-admin
+KEYCLOAK_API_PASSWORD=admin
+KEYCLOAK_API_CLIENT_ID=dmp_web
+KEYCLOAK_API_CLIENT_SECRET=web_secret
+
+#SECURITY
+IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
+IDP_ISSUER_URI_TOKEN=http://host.docker.internal:8081/keycloak/realms/OpenCDMP/protocol/openid-connect/token
+IDP_APIKEY_CLIENT_ID=dmp_web
+IDP_APIKEY_CLIENT_SECRET=web_secret
+IDP_APIKEY_SCOPE=dmp_plugins
+
+#METRICS
+IDP_APIKEY_CLIENT_ID_UUID=c82150e9-a9e5-4a5f-bd0f-5f25460b3e08
+
+QUEUE_APP_ID=opencdmp-api-dev
+
+#EMAIL
+MAIL_HOST=smtp.office365.com
+MAIL_PORT=587
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_AUTH=false
+MAIL_TLS=true
+MAIL_ADDRESS=dmp_web@admin.gr

deployment/opencdmp/backend/config/cors-test.yml

@@ -0,0 +1,3 @@
+web:
+  cors:
+    allowed-origins: [ http://host.docker.internal:8081 ]

deployment/opencdmp/backend/config/deposit-test.yml

@@ -1,6 +1,6 @@
 deposit:
   sources:
-    - url: http://opendmp.zenodo:8080
+    - url: http://opencdmp.zenodo:8080
       repositoryId: Zenodo
       pdfTransformerId: docx-file-transformer
       rdaTransformerId: rda-file-transformer

deployment/opencdmp/backend/config/file-transformer-test.yml

@@ -1,12 +1,12 @@
 file-transformer:
   sources:
-    - url: http://opendmp.file.transformer.docx:8080
+    - url: http://opencdmp.file.transformer.docx:8080
       transformerId: docx-file-transformer
       issuer-url: ${IDP_ISSUER_URI_TOKEN}
       client-id: ${IDP_APIKEY_CLIENT_ID}
       client-secret: ${IDP_APIKEY_CLIENT_SECRET}
       scope: ${IDP_APIKEY_SCOPE}
-    - url: http://opendmp.file.transformer.rdajson:8080
+    - url: http://opencdmp.file.transformer.rdajson:8080
       transformerId: rda-file-transformer
       issuer-url: ${IDP_ISSUER_URI_TOKEN}
       client-id: ${IDP_APIKEY_CLIENT_ID}

deployment/opencdmp/backend/config/keycloak-test.yml

@@ -14,7 +14,7 @@ keycloak-resources:
       parent: 64c07220-0d92-44e5-be6e-d9edf6c10a56
       roleAttributeValueStrategy: 'TenantUser:{tenantCode}'
     TenantManager:
-      parent: 35f22f1-a0cc-4afd-af4c-dba6bb2e7415
+      parent: 735f22f1-a0cc-4afd-af4c-dba6bb2e7415
       roleAttributeValueStrategy: 'TenantManager:{tenantCode}'
     TenantDescriptionTemplateEditor:
       parent: 1bfe8064-4e44-4ec1-a69e-836364a36e37

deployment/opencdmp/backend/config/security-test.yml

@@ -2,7 +2,7 @@ web:
   security:
     enabled: true
     authorized-endpoints: [ api ]
-    allowed-endpoints: [ api/public, api/dmp/public, api/description/public, api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public ]
+    allowed-endpoints: [ api/public, api/dmp/public, api/description/public, api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, api/deposit/public ]
     idp:
       api-key:
         enabled: false

deployment/opencdmp/backend/i18n/en.json

@@ -90,6 +90,17 @@
 			"PLANS": "My Plans",
 			"EXPLORE-PLANS": "Published Plans",
 			"DESCRIPTIONS": "My Descriptions",
+			"BLUEPRINTS": "Blueprints",
+			"DESCRIPTION-TEMPLATES": "Description Templates",
+			"DESCRIPTION-TEMPLATE-TYPES": "Description Types",
+			"ENTITY-LOCKS": "Entity Locks",
+			"REFERENCES": "References",
+			"LANGUAGES": "Languages",
+			"REFERENCE-TYPES": "Reference Types",
+			"PREFILLING-SOURCES": "Prefilling Sources",
+			"TENANT-CONFIGURATION": "Tenant Configuration",
+			"NOTIFICATIONS": "Notifications",
+			"NOTIFICATION-TEMPLATES": "Notification Templates",
 			"EXPLORE": "Published Descriptions",
 			"USERS": "Users",
 			"PROFILE": "My Profile",
@@ -169,6 +180,7 @@
 		"EDIT-DESCRIPTION-TEMPLATE-TYPE": "Edit",
 		"DMP-BLUEPRINTS": "Plan Blueprints",
 		"NEW-DMP-BLUEPRINT": "New",
+		"EDIT-DMP": "Edit",
 		"EDIT-DMP-BLUEPRINT": "Edit",
 		"NEW-DESCRIPTION-TEMPLATES": "New",
 		"EDIT-DESCRIPTION-TEMPLATES": "Edit",
@@ -294,7 +306,9 @@
 				"DESCRIPTION": "From here you can manage the Message Queue events",
 				"ACTIONS": {
 					"SEND-USER-TOUCH": "Send user touch events",
-					"SEND-TENANT-TOUCH": "Send tenant touch events"
+					"SEND-TENANT-TOUCH": "Send tenant touch events",
+					"SEND-DMP-TOUCH": "Send dmp touch events",
+					"SEND-DESCRIPTION-TOUCH": "Send description touch events"
 				}
 			}
 		},
@@ -316,6 +330,10 @@
 			"TITLE": "Extra Logo",
 			"HINT": "Add extra logo"
 		},
+		"NOTIFIER-LIST":{
+			"TITLE": "Notification Preferences",
+			"HINT": "Select available notifiers for Notification Types"
+		},
 		"DEPOSIT-PLUGINS":{
 			"TITLE": "Deposit Plugins",
 			"HINT": "Change deposit plugins"
@@ -363,6 +381,7 @@
 			"NEW-PROFILE-VERSION": "New Version Of ",
 			"NEW-PROFILE-CLONE": "New Clone Of "
 		},
+		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
 			"DATASET-TITLE": "Description Template Name",
 			"DATASET-DESCRIPTION": "Description"
@@ -441,7 +460,7 @@
 				},
 				"FIELD": {
 					"FIELDS": {
-						"FIELD-LABEL": "Label",
+						"FIELD-PLACEHOLDER": "Input Placeholder Text",
 						"REFERENCE-TYPE": "Reference Type",
 						"REFERENCE-TYPE-TITLE": "Reference Type",
 						"MULTIPLE-SELECT": "Multiple Select",
@@ -791,6 +810,7 @@
 			"BACK-TO": "Back to",
 			"EXPORT": "Export",
 			"SAVE": "Save",
+			"CANCEL": "Cancel",
 			"SAVE-AND-CONTINUE": "Save & Continue",
 			"SAVE-AND-ADD-NEW": "Save & Add New",
 			"SAVE-AND-CLOSE": "Save & Close",
@@ -1056,6 +1076,7 @@
 	},
 	"LANGUAGE-EDITOR": {
 		"NEW": "New Language",
+		"TITLE-EDIT-LANGUAGE": "Editing Language",
 		"FIELDS": {
 			"CODE": "Code",
 			"PAYLOAD": "Payload",
@@ -1124,6 +1145,7 @@
 		},
 		"NOTIFICATION-TEMPLATE-EDITOR": {
 			"NEW": "New Notification Template",
+			"TITLE-EDIT-NOTIFICATION-TEMPLATE": "Editing Notification Template",
 			"FIELDS": {
 				"NOTIFICATION-TYPE": "Notification Type",
 				"LANGUAGE": "Language",
@@ -1237,6 +1259,7 @@
 	},
 	"DESCRIPTION-TEMPLATE-TYPE-EDITOR": {
 		"NEW": "New Description Type",
+		"TITLE-EDIT-DESCRIPTION-TEMPLATE-TYPE": "Editing Description Template Type",
 		"FIELDS": {
 			"NAME": "Name"
 		},
@@ -1245,10 +1268,19 @@
 			"FINALIZE": "Finalize",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
+		},
+		"MESSAGES": {
+			"MISSING-FIELDS": "There are some required fields left unfilled. Please check the Template and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)"
+		},
+		"FINALIZE-DIALOG": {
+			"TITLE": "Finalize this item?",
+			"CONFIRM": "Confirm",
+			"NEGATIVE": "Cancel"
 		}
 	},
 	"REFERENCE-TYPE-EDITOR": {
 		"NEW": "New Reference Type",
+		"TITLE-EDIT-REFERENCE-TYPE": "Editing Reference Type",
 		"SOURCES-REQUIRED": "Required",
 		"FIELDS": {
 			"SOURCE-CONFIGURATION": "Source Configuration",
@@ -1346,6 +1378,7 @@
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"NEW": "New Prefilling Source",
+		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
 		"FIELDS": {
 			"FIXED-VALUE-FIELDS": "Fixed Value Fields",
 			"FIELDS": "API Fields",
@@ -1371,6 +1404,7 @@
 	},
 	"REFERENCE-EDITOR": {
 		"NEW": "New Reference",
+		"TITLE-EDIT-REFERENCE": "Editing Reference",
 		"FIELDS": {
 			"LABEL": "Label",
 			"TYPE": "Type",
@@ -1399,6 +1433,7 @@
 			"CLONE": "Clone Plan Blueprint",
 			"NEW-VERSION": "Create New Version of Plan Blueprint"
 		},
+		"TITLE-EDIT-BLUEPRINT": "Editing Blueprint",
 		"SECTIONS-REQUIRED": "Required",
 		"FIELDS-REQUIRED": "Required",
 		"SYSTEM-FIELDS-REQUIRED": "Title, Description, Language and  Access are required",

deployment/opencdmp/backend/material/faq/Faq_en.html

@@ -84,7 +84,7 @@
 						familiarize users with basic RDM concepts and guide them throughout the process of
 						writing DMPs. It also utilises the OpenAIRE pool of services and inferred sources to
 						make DMPs more dynamic in use and easier to be completed and published. Argos is
-						based on the OpenDMP <a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
+						based on the OpenCDMP <a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
 							target="_blank">open source software</a> and is available through the <a
 							href="http://catalogue.openaire.eu/" target="_blank">OpenAIRE
 							Service catalogue</a> and the <a
@@ -660,7 +660,7 @@
 						Is Argos open source?
 					</h4>
 					<p>
-						Yes, it is. The OpenDMP software that Argos has deployed upon is open source code
+						Yes, it is. The OpenCDMP software that Argos has deployed upon is open source code
 						available under Apache 2.0 license. You may find more information about the software
 						<a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
 							target="_blank">here</a>.

deployment/opencdmp/backend/material/terms-of-service/TermsOfService_en.html

@@ -84,10 +84,10 @@
 			</div>
 			<div class="row">
 				<div class="col-md-12">
-					<p><span>The </span><span>OpenDMP</span><span>&nbsp;service was developed to provide a more flexible, </span><span>collaborative </span><span>environment with machine actionable solutions in writing, sharing and publishing Data Management Plans (DMPs). It is a product of </span><span>cooperation between </span><span>OpenAIRE </span><span>AMKE</span><span class="c0">&nbsp;and EUDAT CDI and is offered both as a software &ldquo;OpenDMP &#39;&#39; and as an online service under the name &ldquo;ARGOS&rdquo;. </span></p>
+					<p><span>The </span><span>OpenCDMP</span><span>&nbsp;service was developed to provide a more flexible, </span><span>collaborative </span><span>environment with machine actionable solutions in writing, sharing and publishing Data Management Plans (DMPs). It is a product of </span><span>cooperation between </span><span>OpenAIRE </span><span>AMKE</span><span class="c0">&nbsp;and EUDAT CDI and is offered both as a software &ldquo;OpenCDMP &#39;&#39; and as an online service under the name &ldquo;ARGOS&rdquo;. </span></p>
 					<p><span></span></p>
 					<ol>
-						<li><span><a href="https://code-repo.d4science.org/MaDgiK-CITE/argos">OpenDMP software</a></span><span>&nbsp;is offered under the Free Open Source Software license &nbsp;</span><span>Apache 2.0</span><span class="c0">, for further development and use by institutions and interested parties.</span></li>
+						<li><span><a href="https://code-repo.d4science.org/MaDgiK-CITE/argos">OpenCDMP software</a></span><span>&nbsp;is offered under the Free Open Source Software license &nbsp;</span><span>Apache 2.0</span><span class="c0">, for further development and use by institutions and interested parties.</span></li>
 						<li><span><a href="https://argos.openaire.eu/">ARGOS</a></span><span>&nbsp;service</span><span>&nbsp;is offered by</span><span>&nbsp;</span><span>OpenAIRE</span><span>&nbsp;as </span><span>part of its mission to support Open Science in the European Research Area, focusing on information linking and contextualisation that enriches its </span><span class="c5"><a href="https://zenodo.org/record/2600275#.XZpJgUYzY2w">Research Graph</a></span><span>.</span><span class="c0">&nbsp;Use of ARGOS denotes agreement with the following terms:</span>
 							<ol>
 								<li><span>ARGOS is a software interface and a database with no storage capacity to store or preserve research data. The DMPs created are hosted in the </span><span>OpenAIRE </span><span>production environment for the sole purpose of exposing the DMP records once finalised (&ldquo;published&rdquo;). If assigned a DOI, the DMP records are linked to and preserved in Zenodo, the OpenAIRE&rsquo;s repository service. The ARGOS service is made available for use free-of-charge for research, educational and informational purposes.</span></li>

deployment/opencdmp/backend/material/user-guide/UserGuide_pt.html

@@ -1946,7 +1946,7 @@
             margin-left: -20px;
         }
     </style>
-	<base href="https://devel.opendmp.eu/">
+	<base href="https://devel.opencdmp.eu/">
 </head>
 
 <body data-spy="scroll" data-target="#toc">
@@ -1965,15 +1965,15 @@
 <p><strong>Modelo de Dados</strong> &ndash; &eacute; composto por um conjunto de quest&otilde;es que descrevem o que os Datasets cont&ecirc;m e como s&atilde;o tratados. Estes modelos est&atilde;o ligados a PGDs, de modo a que os utilizadores tenham acesso a formatos espec&iacute;ficos consoante a institui&ccedil;&atilde;o a que reportam. Os modelos s&oacute; podem ser modificados por administradores. Um <strong>grant</strong> e/ou um <strong>projeto </strong>definem o contexto em que um ou mais PGDs podem ser criados.</p>
 </li>
 <li>
-<p style="line-height: 2;"><strong>Importa</strong><strong>r ficheiro </strong>- Suporta a fun&ccedil;&atilde;o de importar ficheiros em formato .json, que s&atilde;o produzidos de acordo com as especifica&ccedil;&otilde;es da Research Data Alliance (RDA) para PGDs acion&aacute;veis por m&aacute;quina.<br /><br /><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture1.png" alt="" width="344" height="287" /></span></p>
+<p style="line-height: 2;"><strong>Importa</strong><strong>r ficheiro </strong>- Suporta a fun&ccedil;&atilde;o de importar ficheiros em formato .json, que s&atilde;o produzidos de acordo com as especifica&ccedil;&otilde;es da Research Data Alliance (RDA) para PGDs acion&aacute;veis por m&aacute;quina.<br /><br /><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture1.png" alt="" width="344" height="287" /></span></p>
 </li>
 </ul>
 <br />
-<p style="padding-left: 40px; text-align: justify; line-height: 2;">O bot&atilde;o <strong>&ldquo;Criar novo PGD&rdquo; </strong>permite de forma simples iniciar o seu plano. Esta op&ccedil;&atilde;o<strong> </strong>fornece um editor que percorre os elementos essenciais de um PGD, guiando o processo de cria&ccedil;&atilde;o do documento passo a passo.<br /><br /><em>A partir do "In&iacute;cio"<br /><br /></em><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture2.png" alt="" width="227" height="42" /><br /><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture3.png" alt="" width="283" height="236" /></span><br /></span></p>
+<p style="padding-left: 40px; text-align: justify; line-height: 2;">O bot&atilde;o <strong>&ldquo;Criar novo PGD&rdquo; </strong>permite de forma simples iniciar o seu plano. Esta op&ccedil;&atilde;o<strong> </strong>fornece um editor que percorre os elementos essenciais de um PGD, guiando o processo de cria&ccedil;&atilde;o do documento passo a passo.<br /><br /><em>A partir do "In&iacute;cio"<br /><br /></em><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture2.png" alt="" width="227" height="42" /><br /><span style="background-color: #fbeeb8; color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture3.png" alt="" width="283" height="236" /></span><br /></span></p>
 <br />
-<p style="padding-left: 40px; text-align: justify;"><em>A partir de &ldquo;Adicione um Dataset&rdquo;<br /><br /></em><span style="color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture4.png" alt="" width="278" height="232" /></span><br /><br /></span><strong>Adicionar um Dataset</strong> &eacute; uma forma simples de adicionar novos modelos de dados a PGDs pr&eacute;-existentes.<br /><br /><em>A partir do &ldquo;In&iacute;cio&rdquo;<br /><br /></em><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture5.png" alt="" width="523" height="248" /></p>
+<p style="padding-left: 40px; text-align: justify;"><em>A partir de &ldquo;Adicione um Dataset&rdquo;<br /><br /></em><span style="color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture4.png" alt="" width="278" height="232" /></span><br /><br /></span><strong>Adicionar um Dataset</strong> &eacute; uma forma simples de adicionar novos modelos de dados a PGDs pr&eacute;-existentes.<br /><br /><em>A partir do &ldquo;In&iacute;cio&rdquo;<br /><br /></em><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture5.png" alt="" width="523" height="248" /></p>
-<p style="padding-left: 40px; text-align: justify;"><em>A partir de &ldquo;Os meus Datasets&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture6.png" alt="" width="233" height="93" /></span><br /><br /><em>A partir de &ldquo;Os meus PGDs&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture7.png" alt="" width="272" height="387" /></span><br /><br /></p>
+<p style="padding-left: 40px; text-align: justify;"><em>A partir de &ldquo;Os meus Datasets&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture6.png" alt="" width="233" height="93" /></span><br /><br /><em>A partir de &ldquo;Os meus PGDs&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture7.png" alt="" width="272" height="387" /></span><br /><br /></p>
-<p style="padding-left: 40px; text-align: justify;"><em>A partir do &ldquo;Editor de Dataset&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture8.png" alt="" width="239" height="194" /></span><br /><br /></p>
+<p style="padding-left: 40px; text-align: justify;"><em>A partir do &ldquo;Editor de Dataset&rdquo;<br /><br /></em><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture8.png" alt="" width="239" height="194" /></span><br /><br /></p>
 <h2 id="mcetoc_1fbs4o53q132" style="text-align: justify;">1.2 &nbsp;Outros termos</h2>
 <ul style="text-align: justify;">
 <li>
@@ -1996,7 +1996,7 @@
 <h1 id="mcetoc_1fbs4o53q133" style="text-align: justify;">2. Navega&ccedil;&atilde;o</h1>
 <h2 id="mcetoc_1fbs4o53q134" style="text-align: justify;">2.1 P&aacute;gina Inicial</h2>
 <p style="text-align: justify; line-height: 2;">A p&aacute;gina inicial poder&aacute; ser encontrada em <a href="https://argos.openaire.eu/splash/">https://argos.openaire.eu/splash/</a>, tamb&eacute;m acess&iacute;vel atrav&eacute;s do<a href="http://catalogue.openaire.eu/search;quantity=10"> </a><a href="http://catalogue.openaire.eu/">Cat&aacute;logo de Servi&ccedil;os do OpenAIRE</a> e<a href="https://marketplace.eosc-portal.eu/services/argos?fromc=data-management"> </a><a href="https://marketplace.eosc-portal.eu/services/argos">EOSC</a>.</p>
-<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture9.png" alt="" width="528" height="265" /></span></p>
+<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture9.png" alt="" width="528" height="265" /></span></p>
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Sobre &ndash; </strong>Informa sobre o &acirc;mbito e principais fun&ccedil;&otilde;es da ferramenta (como funciona, Roadmap, FAQs, quais os contribuidores).</p>
@@ -2013,13 +2013,13 @@
 </ul>
 <h2 id="mcetoc_1fbs4o53q135" style="text-align: justify;">2.2 &nbsp;&nbsp;&nbsp;Login</h2>
 <p style="text-align: justify;"><br />Est&atilde;o dispon&iacute;veis diferentes op&ccedil;&otilde;es de login, desde meios de comunica&ccedil;&atilde;o social a canais de investiga&ccedil;&atilde;o e comunica&ccedil;&atilde;o acad&eacute;mica.</p>
-<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture10.png" alt="" width="240" height="228" /></span></span><br /><em>Aten&ccedil;&atilde;o! N&atilde;o &eacute; necess&aacute;ria uma conta de utilizador.<br /><br /></em></p>
+<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture10.png" alt="" width="240" height="228" /></span></span><br /><em>Aten&ccedil;&atilde;o! N&atilde;o &eacute; necess&aacute;ria uma conta de utilizador.<br /><br /></em></p>
 <h2 id="mcetoc_1fbs4o53q136" style="text-align: justify;">2.3&nbsp;&nbsp; Menu do Utilizador</h2>
 <p style="text-align: justify;">Espa&ccedil;o dedicado e que poder&aacute; ser customizado de acordo com o perfil pessoal do utilizador.<br /><br /></p>
 <table style="height: 263px; width: 845px;" width="634">
 <tbody>
 <tr>
-<td style="width: 323px;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture11.png" alt="" width="199" height="193" /></span></td>
+<td style="width: 323px;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture11.png" alt="" width="199" height="193" /></span></td>
 <td style="width: 518px;">
 <p style="text-align: justify; line-height: 2;"><strong>Defini&ccedil;&otilde;es do Meu Perfil</strong> -&nbsp; Exibe a p&aacute;gina de perfil que cont&eacute;m detalhes&nbsp; tais como: nome, e-mail, dados da conta Zenodo, etc.</p>
 <p style="text-align: justify; line-height: 2;"><strong>PGDs associados</strong> - Cole&ccedil;&atilde;o dos PGDs do utilizador.</p>
@@ -2046,12 +2046,12 @@
 </td>
 </tr>
 <tr style="height: 289px;">
-<td style="width: 386px; height: 289px;" width="301"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><br /><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture12.png" alt="" width="259" height="633" /></span></td>
+<td style="width: 386px; height: 289px;" width="301"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><br /><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture12.png" alt="" width="259" height="633" /></span></td>
 <td style="width: 74px; height: 289px;">
 <p><span style="font-size: 12pt; font-family: arial, helvetica, sans-serif;"><strong>&nbsp;</strong></span></p>
 </td>
 <td style="width: 379px; height: 289px;" width="301">
-<p><span style="font-size: 12pt; font-family: arial, helvetica, sans-serif;"><strong>&nbsp;</strong></span><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture13.png" alt="" width="244" height="635" /></span></p>
+<p><span style="font-size: 12pt; font-family: arial, helvetica, sans-serif;"><strong>&nbsp;</strong></span><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture13.png" alt="" width="244" height="635" /></span></p>
 </td>
 </tr>
 <tr style="height: 77px;">
@@ -2132,11 +2132,11 @@
 <h2 id="mcetoc_1fbs4o53q138" style="text-align: justify;">2.5&nbsp;&nbsp; In&iacute;cio</h2>
 <p style="text-align: justify;">O &ldquo;In&iacute;cio&rdquo; &eacute; a informa&ccedil;&atilde;o que aparece depois de entrar no Argos a partir da p&aacute;gina inicial.</p>
 <p style="text-align: justify;">Inclui informa&ccedil;&atilde;o condensada baseada na fun&ccedil;&atilde;o Argos e na sua utiliza&ccedil;&atilde;o.</p>
-<p style="text-align: justify;"><strong><br />In&iacute;cio &ndash; </strong><strong>Antes de iniciar a sess&atilde;o<br /></strong><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture14.png" alt="" width="386" height="238" /></span></span></p>
+<p style="text-align: justify;"><strong><br />In&iacute;cio &ndash; </strong><strong>Antes de iniciar a sess&atilde;o<br /></strong><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture14.png" alt="" width="386" height="238" /></span></span></p>
 <table style="width: 941px;" width="600">
 <tbody>
 <tr>
-<td style="width: 436px;" width="404"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="float: left;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture15.png" alt="" width="394" height="204" /></span></span></td>
+<td style="width: 436px;" width="404"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="float: left;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture15.png" alt="" width="394" height="204" /></span></span></td>
 <td style="width: 503px;" width="196">
 <p style="line-height: 2;"><strong><br />&Uacute;ltima Atividade</strong> - Exibe os PGDs e Datasets publicamente dispon&iacute;veis, de acordo com a data da sua publica&ccedil;&atilde;o no Argos e a sua etiqueta (PGDs ou Datasets).</p>
 </td>
@@ -2147,7 +2147,7 @@
 <table style="width: 943px;" width="600">
 <tbody>
 <tr>
-<td style="width: 243.5px;" width="124"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture16.png" alt="" width="113" height="220" /></span></span></td>
+<td style="width: 243.5px;" width="124"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture16.png" alt="" width="113" height="220" /></span></span></td>
 <td style="width: 698.5px;" width="476">
 <p style="line-height: 2; text-align: justify;"><strong><br />Uso P&uacute;blico</strong> - Mostra o n&uacute;mero de PGDs, Datasets, Grants e Organiza&ccedil;&otilde;es publicamente dispon&iacute;veis e inclu&iacute;das no Argos.</p>
 <p style="line-height: 2; text-align: justify;">&nbsp;</p>
@@ -2157,11 +2157,11 @@
 </tbody>
 </table>
 <p style="text-align: justify;">&nbsp;</p>
-<p style="text-align: justify;"><strong>In&iacute;cio - Ap&oacute;s Iniciar a Sess&atilde;o<br /><br /></strong><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture17.png" alt="" width="449" height="212" /></span></span><br /><br /></p>
+<p style="text-align: justify;"><strong>In&iacute;cio - Ap&oacute;s Iniciar a Sess&atilde;o<br /><br /></strong><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture17.png" alt="" width="449" height="212" /></span></span><br /><br /></p>
 <table style="width: 942px;" width="600">
 <tbody>
 <tr>
-<td style="width: 461px;" width="472"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture18.png" alt="" width="427" height="279" /></span></span></td>
+<td style="width: 461px;" width="472"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture18.png" alt="" width="427" height="279" /></span></span></td>
 <td style="width: 480px;" width="128">
 <p style="text-align: justify; line-height: 2;"><strong><br />&Uacute;ltima Atividade </strong>- Exibe os PGDs e Datasets do utilizador, de acordo com a data da sua &uacute;ltima modifica&ccedil;&atilde;o, estado&nbsp; do documento (rascunho, finalizado, publicado) e a sua etiqueta (PGDs ou Datasets).</p>
 </td>
@@ -2172,7 +2172,7 @@
 <table style="width: 944px;" width="600">
 <tbody>
 <tr>
-<td style="width: 462px;" width="126"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture19.png" alt="" width="119" height="233" /></span></span></td>
+<td style="width: 462px;" width="126"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture19.png" alt="" width="119" height="233" /></span></span></td>
 <td style="width: 481px;" width="474">
 <p style="line-height: 2;"><strong><br />Uso Pessoal </strong>- Mostra a atividade do utilizador nos PGDs, Datasets, Grants e Organiza&ccedil;&otilde;es.</p>
 </td>
@@ -2184,7 +2184,7 @@
 <br />
 <p style="text-align: justify; line-height: 2;">Cont&eacute;m todos os PGDs e Datasets de que o utilizador &eacute; propriet&aacute;rio ou colaborador. Tanto os PGDs, como os Datasets, s&atilde;o classificados pela data da sua &uacute;ltima modifica&ccedil;&atilde;o, o estado do documento (rascunho, finalizado, publicado) e a sua etiqueta (PGDs ou Datasets).<br /><br /></p>
 <h4 style="text-align: justify;"><strong>Os Meus PGDs<br /><br /></strong></h4>
-<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #2dc26b;"><strong>verde</strong></span> trata-se de um PGD, mostrando o papel da pessoa que v&ecirc; o PGD, o estado do processo de escrita, a vers&atilde;o atual do PGD, o grant associado ao PGD, o n&uacute;mero e nome dos Datasets que o PGD tem.<br /><br /><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture20.png" alt="" width="528" height="255" /></span></span></p>
+<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #2dc26b;"><strong>verde</strong></span> trata-se de um PGD, mostrando o papel da pessoa que v&ecirc; o PGD, o estado do processo de escrita, a vers&atilde;o atual do PGD, o grant associado ao PGD, o n&uacute;mero e nome dos Datasets que o PGD tem.<br /><br /><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture20.png" alt="" width="528" height="255" /></span></span></p>
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Exportar</strong> - Suporta o download dos outputs do PGD nos seguintes formatos: PDF, Document, XML, RDA JSON (pode ser importado para outras ferramentas de PGD compat&iacute;veis com a RDA).</p>
@@ -2206,7 +2206,7 @@
 <table style="width: 938px;" width="600">
 <tbody>
 <tr>
-<td style="width: 465px;" width="272"><img style="font-family: arial, helvetica, sans-serif;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture21.png" alt="" width="417" height="152" /></td>
+<td style="width: 465px;" width="272"><img style="font-family: arial, helvetica, sans-serif;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture21.png" alt="" width="417" height="152" /></td>
 <td style="width: 472px;" width="328">
 <p style="line-height: 2;"><strong><br />Nova Vers&atilde;o</strong> - Inicia uma nova vers&atilde;o do PGD.</p>
 <p style="line-height: 2;"><strong>Ver todas as Vers&otilde;es do PGD</strong>&nbsp; - Mostra o hist&oacute;rico das diferentes vers&otilde;es do PGD.</p>
@@ -2217,7 +2217,7 @@
 </table>
 <br />
 <h4 style="text-align: justify;"><strong>Os Meus Datasets<br /><br /></strong></h4>
-<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #f9ec0c;"><strong>amarelo</strong></span> trata-se de um Dataset e mostra o papel da pessoa que visualiza o Dataset, o estado do processo de escrita, o grant associado ao PGD e o t&iacute;tulo do PGD do qual o Dataset faz parte.<br /><br /><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture22.png" alt="" width="470" height="235" /></span></span><br /><br /></p>
+<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #f9ec0c;"><strong>amarelo</strong></span> trata-se de um Dataset e mostra o papel da pessoa que visualiza o Dataset, o estado do processo de escrita, o grant associado ao PGD e o t&iacute;tulo do PGD do qual o Dataset faz parte.<br /><br /><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture22.png" alt="" width="470" height="235" /></span></span><br /><br /></p>
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Exportar</strong> - Suporta o download dos outputs do Dataset nos seguintes formatos: PDF, Document, XML, RDA JSON (pode ser importado para outras ferramentas de PGD compat&iacute;veis com a RDA).</p>
@@ -2238,7 +2238,7 @@
 <p style="text-align: justify; line-height: 2;">Tanto os PGDs como os Datasets s&atilde;o organizados e apresentados pela data da sua &uacute;ltima modifica&ccedil;&atilde;o e pela sua etiqueta (PGDs ou Datasets). Os utilizadores tamb&eacute;m podem procurar o PGD ou Dataset a partir da barra de pesquisa.<br /><br /></p>
 <h4 style="text-align: justify;"><strong>PGDs P&uacute;blicos<br /><br /></strong></h4>
 <p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #2dc26b;"><strong>verde</strong></span> trata-se de um PGD e exibe o t&iacute;tulo do PGD, o seu estado, a sua vers&atilde;o, o grant associado, o n&uacute;mero e o nome dos Datasets que o PGD cont&eacute;m.</p>
-<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture23.png" alt="" width="606" height="181" /></span></span><br /><br /></span></p>
+<p style="text-align: justify;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture23.png" alt="" width="606" height="181" /></span></span><br /><br /></span></p>
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Exportar</strong> - Suporta o download dos outputs do PGD nos seguintes formatos: PDF, Document, XML, RDA JSON (pode ser importado para outras ferramentas de PGD compat&iacute;veis com a RDA).</p>
@@ -2250,7 +2250,7 @@
 </li>
 </ul>
 <h4 style="text-align: justify;"><strong>Datasets P&uacute;blicos<br /><br /></strong></h4>
-<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #f9ec0c;"><strong>amarelo</strong></span> trata-se de um Dataset P&uacute;blico e mostra o t&iacute;tulo do Dataset, o seu estado, o grant associado ao PGD e o papel da pessoa que visualiza o Dataset, o estado do processo de escrita, o grant<em> </em>associado ao PGD e o t&iacute;tulo do PGD do qual o Dataset faz parte.<br /><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture24.png" alt="" width="604" height="165" /></span></span></span><br /><br /></p>
+<p style="text-align: justify; line-height: 2;">Quando a etiqueta &eacute; <span style="color: #f9ec0c;"><strong>amarelo</strong></span> trata-se de um Dataset P&uacute;blico e mostra o t&iacute;tulo do Dataset, o seu estado, o grant associado ao PGD e o papel da pessoa que visualiza o Dataset, o estado do processo de escrita, o grant<em> </em>associado ao PGD e o t&iacute;tulo do PGD do qual o Dataset faz parte.<br /><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture24.png" alt="" width="604" height="165" /></span></span></span><br /><br /></p>
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Exportar</strong> - Suporta o download dos outputs do Dataset nos seguintes formatos: PDF, Document, XML, RDA JSON (pode ser importado para outras ferramentas de PGD compat&iacute;veis com a RDA).</p>
@@ -2259,7 +2259,7 @@
 <table style="height: 147px; width: 934px;" width="602">
 <tbody>
 <tr>
-<td style="width: 603.75px;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture25.png" alt="" width="285" height="104" /></span></span></span></td>
+<td style="width: 603.75px;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture25.png" alt="" width="285" height="104" /></span></span></span></td>
 <td style="width: 328.75px;">
 <p><strong>Copiar o Dataset </strong>- Cria uma c&oacute;pia do Dataset.</p>
 </td>
@@ -2269,14 +2269,14 @@
 <p style="text-align: justify;">&nbsp;</p>
 <h2 id="mcetoc_1fbs4o53q13b" style="text-align: justify;">2.8&nbsp;&nbsp; Criar novo PGD</h2>
 <p style="text-align: justify;"><br />Existem v&aacute;rias formas de criar um novo PGD no Argos.</p>
-<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture26.png" alt="" width="176" height="53" /></span></span></span><br /><br />
+<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture26.png" alt="" width="176" height="53" /></span></span></span><br /><br />
 <p style="padding-left: 40px; text-align: justify; line-height: 2;">Existem 4 etapas envolvidas na cria&ccedil;&atilde;o de um PGD:</p>
 <p style="text-align: justify; line-height: 2; padding-left: 80px;">- Informa&ccedil;&atilde;o Geral<strong>;</strong></p>
 <p style="padding-left: 80px; text-align: justify; line-height: 2;">- Informa&ccedil;&atilde;o sobre o Financiamento;</p>
 <p style="padding-left: 80px; text-align: justify; line-height: 2;">- Informa&ccedil;&atilde;o sobre a Licen&ccedil;a;</p>
 <p style="padding-left: 80px; text-align: justify; line-height: 2;">- Informa&ccedil;&atilde;o sobre os Datasets.<br /><br /></p>
 <h4 style="text-align: justify;"><strong>Informa&ccedil;&atilde;o Geral</strong></h4>
-<img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture27.png" alt="" width="604" height="269" /><span style="background-color: #fbeeb8;"><br /><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture28.png" alt="" width="604" height="275" /></span></span></span><br /></span></span><br />
+<img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture27.png" alt="" width="604" height="269" /><span style="background-color: #fbeeb8;"><br /><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture28.png" alt="" width="604" height="275" /></span></span></span><br /></span></span><br />
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>T&iacute;tulo do PGD </strong>- T&iacute;tulo do documento.</p>
@@ -2301,7 +2301,7 @@
 </li>
 </ul>
 <h4 style="text-align: justify;"><strong>Informa&ccedil;&atilde;o sobre o Financiamento<br /><br /></strong></h4>
-<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture29.png" alt="" width="604" height="258" /></span></span></span><br /><br />
+<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture29.png" alt="" width="604" height="258" /></span></span></span><br /><br />
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Organiza&ccedil;&otilde;es de Financiamento</strong> - Integra uma lista onde os utilizadores podem selecionar a organiza&ccedil;&atilde;o atrav&eacute;s da qual a investiga&ccedil;&atilde;o &eacute; financiada. Caso o nome de uma organiza&ccedil;&atilde;o financiadora n&atilde;o possa ser encontrado no Argos, os utilizadores podem criar um novo registo com o nome e detalhes da organiza&ccedil;&atilde;o financiadora ("Inserir manualmente").</p>
@@ -2314,7 +2314,7 @@
 </li>
 </ul>
 <h4 style="text-align: justify;"><strong>Informa&ccedil;&atilde;o sobre a Licen&ccedil;a</strong></h4>
-<strong><span style="font-family: arial, helvetica, sans-serif; font-size: 18pt; background-color: #ffffff; color: #7e8c8d;"><br /></span></strong><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture30.png" alt="" width="604" height="255" /></span></span></span><br /><br />
+<strong><span style="font-family: arial, helvetica, sans-serif; font-size: 18pt; background-color: #ffffff; color: #7e8c8d;"><br /></span></strong><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture30.png" alt="" width="604" height="255" /></span></span></span><br /><br />
 <ul style="text-align: justify;">
 <li>
 <p><strong>Licen&ccedil;a</strong> - Inclui uma lista de licen&ccedil;as a escolher e a atribuir aos PGDs.</p>
@@ -2322,7 +2322,7 @@
 </ul>
 <strong><strong><span style="font-family: arial, helvetica, sans-serif; font-size: 18pt; background-color: #ffffff; color: #7e8c8d;"><br /></span></strong></strong>
 <h4 style="text-align: justify;"><strong>Informa&ccedil;&atilde;o sobre os Datasets</strong></h4>
-<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture31.png" alt="" width="604" height="288" /></span></span></span><br /><br />
+<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture31.png" alt="" width="604" height="288" /></span></span></span><br /><br />
 <ul style="text-align: justify;">
 <li>
 <p style="line-height: 2;"><strong>Informa&ccedil;&atilde;o sobre os Datasets </strong>&ndash; Permite selecionar o modelo para descrever os seus datasets. Poder&aacute; selecionar mais do que um modelo de dados.</p>
@@ -2342,7 +2342,7 @@
 <p style="padding-left: 40px; text-align: justify; line-height: 2;">- Adicionar Datasets aos PGDs existentes.</p>
 <p style="text-align: justify; line-height: 2;"><br />No Argos, os Datasets est&atilde;o ligados e associados a pelo menos um PGD. Um Dataset n&atilde;o pode existir como registo &uacute;nico.</p>
 <p style="text-align: justify; line-height: 2;"><strong>Primeiro </strong><strong>Dataset</strong></p>
-<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture32.png" alt="" width="573" height="281" /></span></span></span><br /><br />
+<span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture32.png" alt="" width="573" height="281" /></span></span></span><br /><br />
 <p style="text-align: justify; line-height: 2;">Uma vez criado o PGD, o utilizador poder&aacute; preencher a descri&ccedil;&atilde;o dos seus dados no &ldquo;Editor de Dataset&rdquo;.</p>
 <p style="text-align: justify; line-height: 2;"><strong>&nbsp;<br /></strong></p>
 <ul style="text-align: justify;">
@@ -2368,18 +2368,18 @@
 </ul>
 <br />
 <h4 style="text-align: justify;"><strong>Selecione um PGD para o seu Dataset</strong></h4>
-<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture33.png" alt="" width="451" height="246" /></span></span></span><br /><br />
+<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture33.png" alt="" width="451" height="246" /></span></span></span><br /><br />
 <p style="text-align: justify; line-height: 2;">Selecione um PGD j&aacute; existente na lista.</p>
 <br />
 <h4 style="text-align: justify;"><strong>Selecione um Modelo</strong></h4>
 <span style="color: #7e8c8d;"><span style="color: #7e8c8d;"><strong><span style="font-family: arial, helvetica, sans-serif; font-size: 18pt;"><br /></span></strong></span></span>
-<p style="text-align: justify; line-height: 2;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture34.png" alt="" width="938" height="458" /></span></span></span></p>
+<p style="text-align: justify; line-height: 2;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture34.png" alt="" width="938" height="458" /></span></span></span></p>
 <span style="color: #7e8c8d;"><strong><span style="font-family: arial, helvetica, sans-serif; font-size: 18pt;"><br /></span></strong></span>
 <p style="text-align: justify; line-height: 2;">Selecionar o modelo de dados para descrever o seu Dataset, de acordo com a organiza&ccedil;&atilde;o que financia o seu grant.</p>
 <h4 style="text-align: justify;"><strong><br />Edite o Dataset</strong></h4>
 <br />
 <p style="text-align: justify; line-height: 2;">O &ldquo;Editor de Dataset&rdquo; apoia na descri&ccedil;&atilde;o de informa&ccedil;&atilde;o de acordo com o modelo selecionado.</p>
-<span style="background-color: #fbeeb8;"><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture35.png" alt="" width="938" height="445" /></span></span></span><br /><br /></span>
+<span style="background-color: #fbeeb8;"><br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture35.png" alt="" width="938" height="445" /></span></span></span><br /><br /></span>
 <ul style="text-align: justify;">
 <li>
 <p><strong>Guardar Datasets - </strong>Existem v&aacute;rias formas de guardar Datasets no Argos. Todas t&ecirc;m a mesma finalidade, diferindo da a&ccedil;&atilde;o de acompanhamento.</p>
@@ -2394,7 +2394,7 @@
 </li>
 <li>
 <p><strong>Concluir &ndash; </strong>Salva todas as altera&ccedil;&otilde;es realizadas, encerrando a janela do editor e redirecionando para o &ldquo;In&iacute;cio&rdquo;.</p>
-<p><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture36.png" alt="" width="456" height="123" /></span></span></span></span></p>
+<p><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture36.png" alt="" width="456" height="123" /></span></span></span></span></p>
 </li>
 </ul>
 <br />
@@ -2402,26 +2402,26 @@
 <p style="text-align: justify; line-height: 2;">Regista os PGDs e Datasets no Argos, ap&oacute;s a sua edi&ccedil;&atilde;o e conclus&atilde;o.</p>
 <p style="text-align: justify; line-height: 2;">Os utilizadores podem visualizar os PGDs e Datasets que criaram. Ao abrir um registo que tenham criado, s&atilde;o-lhes fornecidas funcionalidades adicionais que est&atilde;o ligadas &agrave; conclus&atilde;o do processo de escrita dos PGDs.</p>
 <p style="text-align: justify; line-height: 2;">S&atilde;o aplic&aacute;veis funcionalidades diferentes consoante o estado do PGD, ou seja, antes ou depois da conclus&atilde;o do PGD.</p>
-<p style="text-align: justify; line-height: 2;"><strong><br />Antes de concluir o PGD<br /><br /></strong><img style="color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;" src="https://devel.opendmp.eu/assets/images/guide/pt/Picture37.png" alt="" width="938" height="409" /></p>
+<p style="text-align: justify; line-height: 2;"><strong><br />Antes de concluir o PGD<br /><br /></strong><img style="color: #212529; font-family: var(--bs-font-sans-serif); font-size: 1rem;" src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture37.png" alt="" width="938" height="409" /></p>
 <p style="text-align: justify; line-height: 2;">Antes de concluir o PGD, este pode ainda ser editado, eliminado ou duplicado. Os utilizadores podem rever a informa&ccedil;&atilde;o que acrescentaram relativamente a grants, investigadores, descri&ccedil;&atilde;o do PGD e Datasets e/ou modelos de dados utilizados.</p>
 <p style="text-align: justify; line-height: 2;">Podem ser adicionados novos Datasets em qualquer altura, a partir desta p&aacute;gina.</p>
 <p style="text-align: justify; line-height: 2;">Os utilizadores podem exportar o PGD, come&ccedil;ar a trabalhar numa nova vers&atilde;o e/ou convidar colegas a colaborar na conclus&atilde;o do seu plano.</p>
 <p style="text-align: justify; line-height: 2;"><strong><br />Convidar </strong></p>
-<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture38.png" alt="" width="561" height="348" /></span></span></span><br /><br /><br />
+<span style="background-color: #fbeeb8;"><br /></span><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture38.png" alt="" width="561" height="348" /></span></span></span><br /><br /><br />
-<p style="text-align: justify; line-height: 2;"><strong>Ap&oacute;s concluir o PGD<br /><br /></strong><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture39.png" alt="" width="938" height="408" /></span></span></span><br /></span></p>
+<p style="text-align: justify; line-height: 2;"><strong>Ap&oacute;s concluir o PGD<br /><br /></strong><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture39.png" alt="" width="938" height="408" /></span></span></span><br /></span></p>
 <br />
 <p style="text-align: justify; line-height: 2;">Ap&oacute;s a conclus&atilde;o do PGD, este poder&aacute; ser tornado publicamente vis&iacute;vel no Argos e depositado no Zenodo.</p>
 <p style="text-align: justify; line-height: 2;">Os utilizadores podem exportar o PGD finalizado, come&ccedil;ar a trabalhar numa nova vers&atilde;o e/ou convidar colegas a colaborar na conclus&atilde;o do plano.</p>
 <p style="text-align: justify; line-height: 2;">&Eacute; poss&iacute;vel reverter a conclus&atilde;o do PGD.</p>
 <p style="line-height: 2;">&nbsp;</p>
 <p style="line-height: 2;"><strong>Antes de concluir os Datasets</strong></p>
-<br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture40.png" alt="" width="938" height="291" /></span></span></span><br /><br /><br />
+<br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture40.png" alt="" width="938" height="291" /></span></span></span><br /><br /><br />
 <p style="line-height: 2;">Antes de concluir o Dataset, este pode ainda ser editado, eliminado ou duplicado.</p>
 <p style="line-height: 2;">Os utilizadores podem aceder a todo o PGD do qual o Dataset faz parte, a partir dessa p&aacute;gina, e rever a informa&ccedil;&atilde;o que acrescentaram relativamente ao grant, investigadores e descri&ccedil;&atilde;o do Dataset.</p>
 <p style="line-height: 2;">Os utilizadores podem exportar a descri&ccedil;&atilde;o do Dataset e convidar os colegas a colaborar na sua conclus&atilde;o.</p>
 <p style="line-height: 2;">&nbsp;</p>
 <p style="line-height: 2;"><strong>&nbsp;</strong><strong>Ap&oacute;s concluir os Datasets</strong></p>
-<br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opendmp.eu/assets/images/guide/pt/Picture41.png" alt="" width="938" height="325" /></span></span></span><br /><br />
+<br /><span style="background-color: #fbeeb8;"><span style="background-color: #fbeeb8; font-size: 12pt; font-family: arial, helvetica, sans-serif;"><span style="background-color: #fbeeb8;"><img src="https://devel.opencdmp.eu/assets/images/guide/pt/Picture41.png" alt="" width="938" height="325" /></span></span></span><br /><br />
 <p style="line-height: 2;"><br />Ap&oacute;s a conclus&atilde;o do Dataset, este poder&aacute; ser exportado e partilhado com colegas para revis&atilde;o.<br /><br /><br /></p>
 <p style="line-height: 2;">&nbsp;</p>
 </div>

deployment/opencdmp/file-transformer-docx/config/app.env

@@ -0,0 +1,8 @@
+#Security
+IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
+
+#PDF
+PDF_CONVERTER_URL=http://opencdmp.gotenberg:3000
+
+#Storage
+STORAGE_PATH=/storage

deployment/opencdmp/file-transformer-rda-json/config/app.env

@@ -0,0 +1,5 @@
+#Security
+IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
+
+#Storage
+STORAGE_PATH=/storage

deployment/opencdmp/frontend/config.json

@@ -1,7 +1,7 @@
 {
 	"production": false,
-	"Server": "http://localhost:8081/api",
+	"Server": "http://host.docker.internal:8081/api/",
-	"App": "http://localhost:8081/",
+	"App": "http://host.docker.internal:8081/",
 	"HelpService": {
 		"Enabled": false,
 		"Url": "localhost:5000/"
@@ -11,11 +11,11 @@
 	"defaultBlueprintId": "86635178-36a6-484f-9057-a934e4eeecd5",
 	"keycloak": {
 		"enabled": true,
-		"address": "http://localhost:8082/keycloak/",
+		"address": "http://host.docker.internal:8081/keycloak/",
-		"realm": "openDMP",
+		"realm": "OpenCDMP",
 		"flow": "standard",
 		"clientId": "dmp_webapp",
-		"silentCheckSsoRedirectUri": "http://localhost:8082/assets/silent-check-sso.html",
+		"silentCheckSsoRedirectUri": "http://host.docker.internal:8081/assets/silent-check-sso.html",
 		"scope": "openid profile email address phone dmp_web dmp_notification dmp_annotation identity_provider",
 		"clientSecret": null,
 		"grantType": "code"
@@ -23,7 +23,6 @@
 	"inAppNotificationsCountInterval": "30",
 	"notification_service": {
 		"enabled": true
-		// "address": "http://opendmp.notification:8080/"
 	},
 	"annotation_service": {
 		"enabled": true
@@ -31,7 +30,7 @@
 	"zenodoConfiguration": {
 		"clientId": "dmp_plugins",
 		"oauthUrl": "https://sandbox.zenodo.org/oauth/authorize",
-		"redirectUri": "http://localhost:8081/zenodo/login/external/zenodo"
+		"redirectUri": "http://host.docker.internal:8081/login/external/zenodo"
 	},
 	"logging": {
 		"enabled": true,

deployment/opencdmp/notification/config/app.env

@@ -1,7 +1,7 @@
 #DB
-DB_CONNECTION_STRING=jdbc:postgresql://opendmp.postgres:5432/opendmp
+DB_CONNECTION_STRING=jdbc:postgresql://opencdmp.postgres:5432/opencdmp
-DB_USER=opendmp-psql
+DB_USER=postgres
-DB_PASSWORD=opendmp-admin
+DB_PASSWORD=postgres-admin
 
 #Server
 WEB_PORT=8080
@@ -14,10 +14,10 @@ IDP_APIKEY_SCOPE=dmp_notification-dedicated
 IDP_OPAQUE_CLIENT_ID=
 IDP_OPAQUE_CLIENT_SECRET=
 
-IDP_ISSUER_URI=http://localhost:8082/keycloak/realms/OpenDMP
+IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
 
 #RABBITMQ
-RABBIT_HOST=opendmp.rabbitmq
+RABBIT_HOST=opencdmp.rabbitmq
 RABBIT_PORT=5672
 RABBIT_USER=guest
 RABBIT_PASS=guest

deployment/opencdmp/notification/config/cors-test.yml

@@ -0,0 +1,3 @@
+web:
+  cors:
+    allowed-origins: [ http://host.docker.internal:8081 ]