diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e18319f6ecdbc39affce9b7fa4f0f18c20468d1..68892eeb5dc1217422888f8d8eae53fb2f8bf24f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ stages:
- tata
.machine: &runner-shell
- tags:
- - vitamui, shell
+ tags:
+ - vitamui, shell
test_tata:
stage: tata
@@ -14,7 +14,7 @@ test_tata:
- main
<<: *runner-shell
script:
- # Pour éviter de faire des modifications à distance accidentellement, on supprime le lien vers le référentiel d'origine, on détache la branche de sa remote.
+ # Pour éviter de faire des modifications à distance accidentellement, on supprime le lien vers le référentiel d'origine, on détache la branche de sa remote.
- git remote rm origin
# La commande "git remote add" est utilisée pour créer un dépôt distant. Le premier argument est le nom du dépôt distant et le deuxième son URL
- git remote add origin https://$TOKEN:x-oauth-basic@$LIEN_CIBLE
@@ -22,5 +22,5 @@ test_tata:
- git checkout -b $BRANCHE_CIBLE
# on met à jour la branche distante (Logiquement, elle devrait toujours être au même niveau que la master local)
- git pull origin $BRANCHE_CIBLE
- # on push sur github sur la branche choisie
+ # on push sur github sur la branche choisie
- git push --set-upstream origin $BRANCHE_CIBLE
diff --git a/api/api-ingest/ingest-internal/pom.xml b/api/api-ingest/ingest-internal/pom.xml
index 8accb6fe4db50640a290d04a5cf53811b65c8927..60d93c29ce2b5bbeb04fd1fcdcc37339d1e58586 100644
--- a/api/api-ingest/ingest-internal/pom.xml
+++ b/api/api-ingest/ingest-internal/pom.xml
@@ -204,14 +204,6 @@
<artifactId>simple-odf</artifactId>
</dependency>
<!-- APACHE ODFtoolKit-->
-
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.7</version>
- <scope>system</scope>
- <systemPath>C:\Users\descamps\Java\java-8\lib\tools.jar</systemPath>
- </dependency>
</dependencies>
<build>
diff --git a/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js b/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
index 1b3df4a3080e88d962f99fdbd802345eb68f225e..70c8f2fada922c638d6427658156fa07f9f6a048 100644
--- a/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
+++ b/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
@@ -197,7 +197,8 @@ db.groups.insert({
"system_dsl",
"system_probative_value",
"system_logbook_operation",
- "system_holding_filling_scheme_profile"
+ "system_holding_filling_scheme_profile",
+ "system_pastis"
],
"readonly": false,
"level": "",
diff --git a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
index 94194c3e5deaf652bb861c3609fb1a512aa6afcb..815892ba913155e9533bb815894400557925ef3f 100644
--- a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
@@ -82,6 +82,33 @@ db.profiles.insert({
]
});
+db.profiles.insert({
+ "_id" : "system_pastis",
+ "identifier" : NumberInt(maxIdProfile++),
+ "name" : "Pastis Profile",
+ "description" : "Pastis Profile",
+ "tenantIdentifier": NumberInt({{ vitamui_platform_informations.proof_tenant }}),
+ "applicationName" : "PASTIS_APP",
+ "enabled" : true,
+ "readonly" : true,
+ "level" : "",
+ "customerId" : "system_customer",
+ "roles" : [
+ {
+ "name": "ROLE_GET_PASTIS"
+ },
+ {
+ "name": "ROLE_CREATE_PASTIS"
+ },
+ {
+ "name": "ROLE_UPDATE_PASTIS"
+ },
+ {
+ "name": "ROLE_DELETE_PASTIS"
+ }
+ ]
+});
+
db.profiles.insert({
"_id" : "system_agencies",
"identifier" : NumberInt(maxIdProfile++),
diff --git a/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2 b/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
index 5fa944c9a9e0dbe3059de2428add3714d11d3f75..4b63a1d3c9ee95d00d975083d21568b502196ed2 100644
--- a/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
@@ -130,6 +130,22 @@ db.applications.insert({
"target" : "_self"
});
+db.applications.insert({
+ "identifier" : "PASTIS_APP",
+{% if vitamui.referential.base_url is defined %}
+ "url": "{{ vitamui.pastis.base_url }}/",
+{% endif %}
+ "icon" : "vitamui-icon vitamui-icon-ontologie",
+ "name" : "Profils Documentaires",
+ "category" : "referential",
+ "position" : 1,
+ "hasCustomerList" : false,
+ "hasTenantList" : false,
+ "hasHighlight" : false,
+ "tooltip" : "Accéder, Créer, Modifier ou Supprimer les profils d'archivage et les profils d'unité archivistique",
+ "target" : "_self"
+});
+
db.applications.insert({
"identifier" : "AUDIT_APP",
{% if vitamui.referential.base_url is defined %}
diff --git a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
index f78c18914419d397cb6d55f5ca75319da66bf4c4..6c14a30bed8e0ca52b11807aced5fb63080bb06d 100644
--- a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
@@ -23,7 +23,8 @@ db.contexts.insert({
"ROLE_GET_CONTEXTS", "ROLE_UPDATE_CONTEXTS", "ROLE_CREATE_CONTEXTS",
"ROLE_GET_SECURITY_PROFILES", "ROLE_UPDATE_SECURITY_PROFILES", "ROLE_CREATE_SECURITY_PROFILES", "ROLE_DELETE_SECURITY_PROFILES",
"ROLE_GET_OPERATIONS", "ROLE_RUN_AUDITS", "ROLE_RUN_PROBATIVE_VALUE",
- "ROLE_LOGBOOKS"
+ "ROLE_LOGBOOKS",
+ "ROLE_GET_PASTIS", "ROLE_CREATE_PASTIS", "ROLE_UPDATE_PASTIS", "ROLE_DELETE_PASTIS"
]
});
diff --git a/tools/docker/mongo/mongo_vars_dev.yml b/tools/docker/mongo/mongo_vars_dev.yml
index e6b1ef90a677cec660b5588a30739380e113340d..90b3239e1b3af6aa61175989ca9cc28d1df31194 100644
--- a/tools/docker/mongo/mongo_vars_dev.yml
+++ b/tools/docker/mongo/mongo_vars_dev.yml
@@ -92,3 +92,5 @@ vitamui:
base_url: "https://dev.vitamui.com:4208"
archive_search:
base_url: "https://dev.vitamui.com:4209"
+ pastis:
+ base_url: "https://dev.vitamui.com:4251"
diff --git a/ui/ui-frontend/proxy.conf.json b/ui/ui-frontend/proxy.conf.json
index 90b5c3fc5f0f046d474f2c283a26362b704f6948..b5d94d2a8678848de9c272c29e1b13bb6f0a16b1 100644
--- a/ui/ui-frontend/proxy.conf.json
+++ b/ui/ui-frontend/proxy.conf.json
@@ -1,30 +1,30 @@
{
"/referential-api": {
- "target": "https://sandbox78-adm.cines.fr:9002/",
+ "target": "dev.vitamui.com:9002/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
},
"/identity-api": {
- "target": "https://sandbox78-adm.cines.fr:9001/",
+ "target": "dev.vitamui.com:9001/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
},
"/portal-api": {
- "target": "https://sandbox78-adm.cines.fr:9000/",
+ "target": "dev.vitamui.com:9000/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
},
"/ingest-api": {
- "target": "https://sandbox78-adm.cines.fr:9008/",
+ "target": "dev.vitamui.com:9008/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
},
"/archive-search-api": {
- "target": "https://sandbox78-adm.cines.fr:9009/",
+ "target": "dev.vitamui.com:9009/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"