Commit 087fd901 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

0.12.0

See merge request redmic-project/client/web!20
parents 0c23c943 c3b9f747

.gitlab-ci.yml

+66 −34
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ container-scanning: 
  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

deploy-supporting-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:
@@ -201,21 +201,24 @@ deploy-dev: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}

    url: https://${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

    - branches

  except:

    - master

    - schedules

  when: manual



deploy-supporting-branch:

deploy-stable-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:
@@ -228,52 +231,53 @@ deploy-supporting-branch: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}

    url: https://${DEV_PUBLIC_HOSTNAME}

  only:

    - branches

  except:

    - master

    - dev

  except:

    - schedules

  when: manual



run-functional-tests:

  stage: test-deploy

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  tags:

    - client

    - functional

deploy-supporting-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    GIT_SUBMODULE_STRATEGY: normal

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: client

    SERVICES_TO_CHECK: client_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - type yarn grunt java

    - yarn install || yarn install

    - >

      grunt test-functional-local --server-url="https://appdev.${DEV_PUBLIC_HOSTNAME}" --user="${REDMIC_TEST_USER}"

      --pass="${REDMIC_TEST_PASS}" --role=administrator --suitesGroups="${SUITES_GROUPS}" --headless

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

  only:

    - branches

  except:

    - master

    - schedules

  cache:

    key: ${CI_COMMIT_REF_NAME}

    paths:

      - node_modules/

    policy: pull

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

    expire_in: 1 month

    when: always

    paths:

      - "test_reports/test-functional-local*"

  when: manual



deploy-pro:

deploy-stable-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:
@@ -286,12 +290,13 @@ deploy-pro: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}
@@ -300,3 +305,30 @@ deploy-pro: 
  except:

    - schedules

  when: manual



run-functional-tests:

  stage: test-deploy

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  tags:

    - functional-testing

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  script:

    - type yarn grunt java

    - yarn install || yarn install

    - >

      grunt test-functional-local --server-url="https://${DEV_PUBLIC_HOSTNAME}" --user="${REDMIC_TEST_USER}"

      --pass="${REDMIC_TEST_PASS}" --role=administrator --suitesGroups="${SUITES_GROUPS}" --headless

  only:

    - schedules

  cache:

    key: ${CI_COMMIT_REF_NAME}

    paths:

      - node_modules/

    policy: pull

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

    expire_in: 1 month

    when: always

    paths:

      - "test_reports/test-functional-local*"

deploy/docker-compose.dev.yml

+0 −3
Original line number Diff line number Diff line 
version: '3.5'
 


services:

  web:

deploy/docker-compose.tmpl.yml

+4 −10
Original line number Diff line number Diff line
@@ -7,28 +7,25 @@ services: 
      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

    networks:

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${WEB_PORT}

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m

      start_period: 1m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: '${WEB_PORT}'

        traefik.docker.network: traefik-net

        traefik.default.frontend.rule: PathPrefix:/

        traefik.es.frontend.rule: HostRegexp:{subdomain:^es\\..*$$}

        traefik.es.frontend.priority: '13'

        traefik.default.frontend.rule: Host:${PUBLIC_HOSTNAME}

        traefik.es.frontend.rule: Host:es.${PUBLIC_HOSTNAME}

        traefik.es.frontend.redirect.regex: ^(.*):\\/\\/es\\.(.*)$$

        traefik.es.frontend.redirect.replacement: $$1://$$2

        traefik.es.frontend.redirect.permanent: 'true'

        traefik.en.frontend.rule: HostRegexp:{subdomain:^en\\..*$$}

        traefik.en.frontend.priority: '13'

        traefik.en.frontend.rule: Host:en.${PUBLIC_HOSTNAME}

        traefik.en.frontend.headers.customRequestHeaders: content-language:en

        traefik.backend: web

        traefik.frontend.errors.5xx.status: 500-599
@@ -45,8 +42,5 @@ services: 
          memory: 103M



networks:

  redmic-net:

    external: true



  traefik-net:

    external: true

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.11.4",

  "version": "0.12.0",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/components/steps/_ParametersRelationData.js

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ define([ 
					this._formData.parameter = [];

					for (var i = 0; i < parameters.length; i++) {

						var item = parameters[i],

							name = item.parameter.name + ' - ' + item.unit.name;

							name = item.parameter.name + ' - ' + item.unit.name + ' (' + item.dataDefinition.z + ')';



						this._formData.parameter.push({

							id: item.dataDefinition.id,