From 67d21555fa6a1c0cc39e6291390238a642fecf6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Tue, 31 Aug 2021 11:33:29 +0200
Subject: [PATCH] Fixed bug database effects navigate
---
client/.gitlab-ci.yml | 15 +++++++++++++++
.../src/app/metamodel/effects/database.effects.ts | 4 ++--
server/.gitlab-ci.yml | 15 +++++++++++++++
services/.gitlab-ci.yml | 15 +++++++++++++++
4 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/client/.gitlab-ci.yml b/client/.gitlab-ci.yml
index f803db04..471927d9 100644
--- a/client/.gitlab-ci.yml
+++ b/client/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
- sonar
- build
- dockerize
+ - deploy
variables:
VERSION: "3.7.0"
@@ -81,3 +82,17 @@ dockerize:
- docker pull $CI_REGISTRY/anis/anis-next/client:latest || true
- docker build --cache-from $CI_REGISTRY/anis/anis-next/client:latest -t $CI_REGISTRY/anis/anis-next/client:latest .
- docker push $CI_REGISTRY/anis/anis-next/client:latest
+
+deploy:
+ image: alpine
+ stage: deploy
+ variables:
+ GIT_STRATEGY: none
+ cache: {}
+ dependencies: []
+ script:
+ - apk add --update curl
+ - curl -XPOST $DEV_WEBHOOK_CLIENT
+ only:
+ refs:
+ - develop
\ No newline at end of file
diff --git a/client/src/app/metamodel/effects/database.effects.ts b/client/src/app/metamodel/effects/database.effects.ts
index 968712fc..39c20f7e 100644
--- a/client/src/app/metamodel/effects/database.effects.ts
+++ b/client/src/app/metamodel/effects/database.effects.ts
@@ -48,7 +48,7 @@ export class DatabaseEffects {
this.actions$.pipe(
ofType(databaseActions.addDatabaseSuccess),
tap(() => {
- this.router.navigate(['/admin/survey/database-list']);
+ this.router.navigate(['/admin/database-list']);
this.toastr.success('Database successfully added', 'The new database was added into the database')
})
), { dispatch: false}
@@ -77,7 +77,7 @@ export class DatabaseEffects {
this.actions$.pipe(
ofType(databaseActions.editDatabaseSuccess),
tap(() => {
- this.router.navigate(['/admin/survey/database-list']);
+ this.router.navigate(['/admin/database-list']);
this.toastr.success('Database successfully edited', 'The existing database has been edited into the database')
})
), { dispatch: false}
diff --git a/server/.gitlab-ci.yml b/server/.gitlab-ci.yml
index 11df89cf..5cdac140 100644
--- a/server/.gitlab-ci.yml
+++ b/server/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
- test
- sonar
- dockerize
+ - deploy
variables:
VERSION: "3.7"
@@ -70,3 +71,17 @@ dockerize:
- docker pull $CI_REGISTRY/anis/anis-next/server:latest || true
- docker build --cache-from $CI_REGISTRY/anis/anis-next/server:latest -t $CI_REGISTRY/anis/anis-next/server:latest .
- docker push $CI_REGISTRY/anis/anis-next/server:latest
+
+deploy:
+ image: alpine
+ stage: deploy
+ variables:
+ GIT_STRATEGY: none
+ cache: {}
+ dependencies: []
+ script:
+ - apk add --update curl
+ - curl -XPOST $DEV_WEBHOOK_SERVER
+ only:
+ refs:
+ - develop
\ No newline at end of file
diff --git a/services/.gitlab-ci.yml b/services/.gitlab-ci.yml
index 38f97845..4bfe6473 100644
--- a/services/.gitlab-ci.yml
+++ b/services/.gitlab-ci.yml
@@ -1,5 +1,6 @@
stages:
- dockerize
+ - deploy
variables:
VERSION: "3.7"
@@ -15,3 +16,17 @@ dockerize:
- docker pull $CI_REGISTRY/anis/anis-next/services:latest || true
- docker build --cache-from $CI_REGISTRY/anis/anis-next/services:latest -t $CI_REGISTRY/anis/anis-next/services:latest .
- docker push $CI_REGISTRY/anis/anis-next/services:latest
+
+deploy:
+ image: alpine
+ stage: deploy
+ variables:
+ GIT_STRATEGY: none
+ cache: {}
+ dependencies: []
+ script:
+ - apk add --update curl
+ - curl -XPOST $DEV_WEBHOOK_SERVICES
+ only:
+ refs:
+ - develop
\ No newline at end of file
--
GitLab