Merge branch 'merge-in-master' into 'master'

Merge in master Closes #146 and #39 See merge request documentale/sprint-flows!483
consiglionazionaledellericerche · Jan 17, 2020 · 9a1b3af · 9a1b3af
2 parents d1954a8 + 46f598d
commit 9a1b3af
Show file tree

Hide file tree

Showing 207 changed files with 27,252 additions and 13,286 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,13 +19,20 @@ cache:
     - target/app.war
 
 stages:
+  - test
   - deploy_snapshot
   - build_test_container
   - deploy_test_container
   - release
   - build_prod_container
   - deploy_prod_container
 
+test:
+  stage: test
+  image: docker.si.cnr.it/cnr-maven:$CNR_MAVEN_VERSION
+  script:
+    - mvn -B clean compile sonar:sonar -Dsonar.host.url=http://sonar.si.cnr.it test package -fae
+  allow_failure: true
 
 deploy_dev_snapshot:
   stage: deploy_snapshot
@@ -71,10 +78,12 @@ deploydockertest01e02:
     - test
   script:
     - echo "Deploy to dockertest01"
+    - sed -i "s/CONFIG_REPO_TOKEN/$CONFIG_REPO_TOKEN/g" ./src/main/docker/test/app-con-mancenter.yml
     - sshremote $SSH_CONNECT_DOCKERTEST01 "if [ -f  ''/sites/sprint-flows-test/app.yml'' ]; then docker-compose -p sprint-flows-test -f /sites/sprint-flows-test/app.yml down --remove-orphans; fi && rm -rf /sites/sprint-flows-test && mkdir -p /sites/sprint-flows-test || echo NODIR"
     - scpremote ./src/main/docker/test/app-con-mancenter.yml $SSH_CONNECT_DOCKERTEST01:/sites/sprint-flows-test/app.yml
     - sshremote $SSH_CONNECT_DOCKERTEST01 "cd /sites/sprint-flows-test && docker-compose -p sprint-flows-test -f app.yml pull && docker-compose -p sprint-flows-test -f app.yml up -d"
     - echo "Deploy to dockertest02"
+    - sed -i "s/CONFIG_REPO_TOKEN/$CONFIG_REPO_TOKEN/g" ./src/main/docker/test/app-senza-mancenter.yml
     - sshremote $SSH_CONNECT_DOCKERTEST02 "if [ -f  ''/sites/sprint-flows-test/app.yml'' ]; then docker-compose -p sprint-flows-test -f /sites/sprint-flows-test/app.yml down --remove-orphans; fi && rm -rf /sites/sprint-flows-test && mkdir -p /sites/sprint-flows-test || echo NODIR"
     - scpremote ./src/main/docker/test/app-senza-mancenter.yml $SSH_CONNECT_DOCKERTEST02:/sites/sprint-flows-test/app.yml
     - sshremote $SSH_CONNECT_DOCKERTEST02 "cd /sites/sprint-flows-test && docker-compose -p sprint-flows-test -f app.yml pull && docker-compose -p sprint-flows-test -f app.yml up -d"
@@ -137,11 +146,12 @@ deploydockprod01:
   script:
     - echo "Deploy sprint-flows to dockprod01"
     - echo "setting secrets"
-    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:latest/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:$CI_COMMIT_TAG/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_DATASOURCE_PASSWORD_SED/$POSTGRESS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/CONFIG_REPO_TOKEN/$CONFIG_REPO_TOKEN/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
     - sshremote $SSH_CONNECT_DOCPROD01 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
     - sshremote $SSH_CONNECT_DOCPROD01 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"    - echo "copying docker-compose file"
@@ -168,6 +178,7 @@ deploydockprod02:
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/CONFIG_REPO_TOKEN/$CONFIG_REPO_TOKEN/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
     - sshremote $SSH_CONNECT_DOCPROD02 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
     - sshremote $SSH_CONNECT_DOCPROD02 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"

diff --git a/docs/screenshots/10 - Set Multipli di Dati.jpg b/docs/screenshots/10 - Set Multipli di Dati.jpg
diff --git a/docs/screenshots/11 – visualizzazione set multiplo di dati.jpg b/docs/screenshots/11 – visualizzazione set multiplo di dati.jpg
diff --git a/docs/screenshots/12 – Caricamento Documenti Tipologia 1.jpg b/docs/screenshots/12 – Caricamento Documenti Tipologia 1.jpg
diff --git a/docs/screenshots/13 - Caricamento Documenti Tipologia 2.jpg b/docs/screenshots/13 - Caricamento Documenti Tipologia 2.jpg
diff --git a/docs/screenshots/14 - Caricamento Documenti Tipologia 3.jpg b/docs/screenshots/14 - Caricamento Documenti Tipologia 3.jpg
diff --git a/docs/screenshots/15 - etichette sui documenti.jpg b/docs/screenshots/15 - etichette sui documenti.jpg
diff --git a/docs/screenshots/16 - gestione documenti extra flusso.jpg b/docs/screenshots/16 - gestione documenti extra flusso.jpg
diff --git a/docs/screenshots/17 - Documenti tipo 4.jpg b/docs/screenshots/17 - Documenti tipo 4.jpg
diff --git a/docs/screenshots/17- Elementi Dettagli Flusso.jpg b/docs/screenshots/17- Elementi Dettagli Flusso.jpg
diff --git a/docs/screenshots/18 - Fasi del Flusso.jpg b/docs/screenshots/18 - Fasi del Flusso.jpg
diff --git a/docs/screenshots/2-avvio flusso.jpg b/docs/screenshots/2-avvio flusso.jpg
diff --git a/docs/screenshots/28 - scelta utente in avvio del flusso.jpg b/docs/screenshots/28 - scelta utente in avvio del flusso.jpg
diff --git a/docs/screenshots/3-testo.jpg b/docs/screenshots/3-testo.jpg
diff --git a/docs/screenshots/4 - Area di Testo.jpg b/docs/screenshots/4 - Area di Testo.jpg
diff --git a/docs/screenshots/5 - opzioni scelta con bottoni.jpg b/docs/screenshots/5 - opzioni scelta con bottoni.jpg
diff --git a/docs/screenshots/6 - opzioni scelta con menù ad albero.jpg b/docs/screenshots/6 - opzioni scelta con menù ad albero.jpg
diff --git a/docs/screenshots/7 - Selezione tramite funzione di autocompletamento.jpg b/docs/screenshots/7 - Selezione tramite funzione di autocompletamento.jpg
diff --git a/docs/screenshots/8 – azioni scelta.jpg b/docs/screenshots/8 – azioni scelta.jpg
diff --git a/docs/screenshots/9 – nota informativa.jpg b/docs/screenshots/9 – nota informativa.jpg
diff --git a/docs/screenshots/Export .csv.JPG b/docs/screenshots/Export .csv.JPG
diff --git a/docs/screenshots/Export Summary pdf.JPG b/docs/screenshots/Export Summary pdf.JPG
diff --git a/docs/screenshots/Flusso OIV.jpg b/docs/screenshots/Flusso OIV.jpg
diff --git a/docs/screenshots/HOME.JPG b/docs/screenshots/HOME.JPG
diff --git a/docs/screenshots/Manualistica.jpg b/docs/screenshots/Manualistica.jpg
diff --git a/docs/screenshots/Workflow details.JPG b/docs/screenshots/Workflow details.JPG
diff --git a/docs/screenshots/chronology.JPG b/docs/screenshots/chronology.JPG
diff --git a/docs/screenshots/completed tasks.JPG b/docs/screenshots/completed tasks.JPG
diff --git a/docs/screenshots/dettagi oiv.jpg b/docs/screenshots/dettagi oiv.jpg
diff --git a/docs/screenshots/dettagli flusso.JPG b/docs/screenshots/dettagli flusso.JPG
diff --git a/docs/screenshots/documenti scrivania.JPG b/docs/screenshots/documenti scrivania.JPG
diff --git a/docs/screenshots/flusso oiv con ruoli.jpg b/docs/screenshots/flusso oiv con ruoli.jpg
diff --git a/docs/screenshots/help desk.jpg b/docs/screenshots/help desk.jpg
diff --git a/docs/screenshots/i miei compiti.jpg b/docs/screenshots/i miei compiti.jpg
diff --git a/docs/screenshots/interazione scrivania digitale con altre applicazioni.JPG b/docs/screenshots/interazione scrivania digitale con altre applicazioni.JPG
diff --git a/docs/screenshots/menu.JPG b/docs/screenshots/menu.JPG
diff --git a/docs/screenshots/my tasks.JPG b/docs/screenshots/my tasks.JPG
diff --git a/docs/screenshots/reasearch ative workflows.JPG b/docs/screenshots/reasearch ative workflows.JPG
diff --git a/docs/screenshots/reasearch completed workflows.JPG b/docs/screenshots/reasearch completed workflows.JPG
diff --git a/docs/screenshots/ricerca oiv.jpg b/docs/screenshots/ricerca oiv.jpg
diff --git a/docs/screenshots/ricerca.jpg b/docs/screenshots/ricerca.jpg
diff --git a/docs/screenshots/versione integrata.JPG b/docs/screenshots/versione integrata.JPG
diff --git a/docs/screenshots/versione stand alone.JPG b/docs/screenshots/versione stand alone.JPG
diff --git a/js.sh b/js.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+#echo '################ RIMOZIONE node_modules ###############################################'
+#rm -r src/main/webapp/node_modules
+#rm -r node_modules
+
+echo '################ RIMOZIONE bower_components ###############################################'
+rm -r src/main/webapp/bower_components
+#rm -r bower_components
+
+
+#echo '################ INSTALL NPM ###############################################'
+#npm install
+
+
+echo '################ BOWER install ###############################################'
+#bower install src/main/webapp/node_modules
+bower install