Commit 421c454d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-wmsLayerRefreshInterval' into 'dev' 

Feature wms layer refresh interval

See merge request redmic-project/client/web!39
parents a506f09b dbe92f19

.gitlab-ci.yml

+3 −4
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ stages: 


variables:

  STACK: client

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

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

  WEB_BUILD_IMAGE_TAG: latest



.web-build:

  image: ${WEB_BUILD_IMAGE}

  image: ${WEB_BUILD_IMAGE_NAME}:${WEB_BUILD_IMAGE_TAG}

  cache:

    paths:

      - node_modules/
@@ -127,8 +128,6 @@ prepare-built-version: 
run-functional-tests:

  stage: test-deploy

  extends: .prepare-dependencies

  tags:

    - functional-testing

  script:

    - >

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

deploy/docker-compose.tmpl.yml

+10 −5
Original line number Diff line number Diff line
@@ -4,16 +4,17 @@ services: 
  web:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

      - API_URL

      - PRODUCTION

      OAUTH_URL:

      OAUTH_CLIENT_SECRET:

      API_URL:

      PRODUCTION:

    networks:

      - traefik-net

      - metric-net

    healthcheck:

      test: wget --spider -q http://localhost:${PORT}

      interval: 30s

      timeout: 10s

      timeout: 30s

      retries: 3

      start_period: 1m

    deploy:
@@ -46,3 +47,7 @@ networks: 
  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true

public/javascript/redmic/modules/base/_Module.js

+7 −4
Original line number Diff line number Diff line
@@ -612,12 +612,13 @@ define([ 


		_subConnect: function(req) {



			var actions = req.actions;

			var actions = req.actions,

				forceResumeActions = req.forceResumeActions;



			if (actions) {

				this._connectActions(actions);

			} else {

				this._resume();

				this._resume(forceResumeActions);



				this._emitEvt('CONNECT', {

					moduleChannel: this.getChannel()
@@ -650,11 +651,13 @@ define([ 
			this.statusFlags.paused = value;

		},



		_resume: function() {

		_resume: function(forceResumeActions) {



			this._getPaused() && this._setPaused(false);



			if (forceResumeActions) {

				this.actionsPaused = {};

			}

		},



		_subDisconnect: function(req) {

public/javascript/redmic/modules/map/Atlas.js

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ define([ 
							queryable: item.queryable,

							layerId: layerId,

							layerLabel: layerLabel,

							timeRefresh: item.timeRefresh

							refresh: item.refresh

						}

					}

				};

public/javascript/redmic/modules/map/Map.js

+9 −1
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ define([ 
					LAYER_ADDED_CONFIRMED: "layerAddedConfirmed",

					LAYER_REMOVED_FORWARDED: "layerRemovedForwarded",

					LAYER_REMOVED_CONFIRMED: "layerRemovedConfirmed",

					SET_QUERYABLE_CURSOR: "setQueryableCursor"

					SET_QUERYABLE_CURSOR: "setQueryableCursor",

					MAP_SHOWN: "mapShown",

					MAP_HIDDEN: "mapHidden"

				},



				ownChannel: "map",
@@ -220,6 +222,12 @@ define([ 
			},{

				event: 'LAYER_INFO_FORWARDED',

				channel: this.getChannel("LAYER_INFO")

			},{

				event: 'ME_OR_ANCESTOR_SHOWN',

				channel: this.getChannel('MAP_SHOWN')

			},{

				event: 'ME_OR_ANCESTOR_HIDDEN',

				channel: this.getChannel('MAP_HIDDEN')

			});

		},