diff --git a/Jenkinsfile b/Jenkinsfile
index a95473f43c6ecb961a2c7bba2f90e5275f70e3d3..195007e72efd3e98095a241ff64fde8cbe5cc432 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -171,6 +171,8 @@ pipeline {
branch "develop*"
branch "master_*"
tag pattern: "^[1-9]+\\.[0-9]+\\.[0-9]*+-?[0-9]*\$", comparator: "REGEXP"
+ tag pattern: "^[1-9]+\\.[0-9]+-?[0-9]*\$", comparator: "REGEXP"
+ tag pattern: "^[1-9]+\\.rc+\\.[0-9]+-?[0-9]*\$", comparator: "REGEXP"
}
environment(name: 'DO_PUBLISH', value: 'true')
environment(name: 'DO_BUILD', value: 'true')
@@ -189,6 +191,8 @@ pipeline {
branch "master_*"
branch "master"
tag pattern: "^[1-9]+\\.[0-9]+\\.[0-9]+-?[0-9]*\$", comparator: "REGEXP"
+ tag pattern: "^[1-9]+\\.[0-9]+-?[0-9]*\$", comparator: "REGEXP"
+ tag pattern: "^[1-9]+\\.rc+\\.[0-9]+-?[0-9]*\$", comparator: "REGEXP"
}
environment(name: 'DO_CHECKMARX', value: 'true')
}
diff --git a/api/api-archive-search/archive-search-commons/pom.xml b/api/api-archive-search/archive-search-commons/pom.xml
index 8af163b4332543cfb7778646af50c7c6bd94160c..28e1a06d1f2b6d38c5dd343ae008eb605862e013 100644
--- a/api/api-archive-search/archive-search-commons/pom.xml
+++ b/api/api-archive-search/archive-search-commons/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-archive-search</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/ArchiveSearchConsts.java b/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/ArchiveSearchConsts.java
index d8639e7e6e21e8ad1ef96b19e9590698903ec24f..554485287f79091b514c25db91c9de13bddfd464 100644
--- a/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/ArchiveSearchConsts.java
+++ b/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/common/ArchiveSearchConsts.java
@@ -143,8 +143,6 @@ public class ArchiveSearchConsts {
public static Map<String, String> SIMPLE_FIELDS_VALUES_MAPPING =
Map.of("GUID", "#id", "GUID_OPI", "#opi",
ORIGINATING_AGENCY_ID_FIELD, "#originating_agency",
- "TITLE", "Title",
- "DESCRIPTION", "Description",
"START_DATE", "StartDate",
"END_DATE", "EndDate",
"SP_LABEL", "originating_agency_label"
@@ -159,8 +157,6 @@ public class ArchiveSearchConsts {
/* Query fields */
public static final String IDENTIFIER = "Identifier";
public static final String UNIT_TYPE = "#unitType";
- public static final String TITLE = "Title";
- public static final String DESCRIPTION = "Description";
public static final String START_DATE = "StartDate";
public static final String PRODUCER_SERVICE = "#originating_agency";
public static final String GUID = "#id";
@@ -176,6 +172,16 @@ public class ArchiveSearchConsts {
public static final String SHORT_NAME = "ShortName";
public static final String PUID = "PUID";
+ /* Title and Description Query fields */
+ public static final String TITLE = "Title";
+ public static final String TITLE_FR = "Title_.fr";
+ public static final String TITLE_EN = "Title_.en";
+ public static final String DESCRIPTION = "Description";
+ public static final String DESCRIPTION_FR = "Description_.fr";
+ public static final String DESCRIPTION_EN = "Description_.en";
+ public static final String TITLE_CRITERIA = "TITLE";
+ public static final String DESCRIPTION_CRITERIA = "DESCRIPTION";
+
}
diff --git a/api/api-archive-search/archive-search-external-client/pom.xml b/api/api-archive-search/archive-search-external-client/pom.xml
index e2eb75153d5746472e0474b86d00f197b1d40357..74b59f56076f894683aa819b9c8eb8f0e724d872 100644
--- a/api/api-archive-search/archive-search-external-client/pom.xml
+++ b/api/api-archive-search/archive-search-external-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-archive-search</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-archive-search/archive-search-external/pom.xml b/api/api-archive-search/archive-search-external/pom.xml
index 80dc1e15ca762591e113ccf0632d6e81257fd740..38af0ef58d835e1ebe8c105f80569d24a377a1ce 100644
--- a/api/api-archive-search/archive-search-external/pom.xml
+++ b/api/api-archive-search/archive-search-external/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-archive-search</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-archive-search/archive-search-internal-client/pom.xml b/api/api-archive-search/archive-search-internal-client/pom.xml
index b81620432bb5cefc9f02d8dd245ca15140f217a9..a42012efe9525bac2cb1b0c4ed3d4d696feed2ea 100644
--- a/api/api-archive-search/archive-search-internal-client/pom.xml
+++ b/api/api-archive-search/archive-search-internal-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-archive-search</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-archive-search/archive-search-internal/pom.xml b/api/api-archive-search/archive-search-internal/pom.xml
index 8ba8e6fc65e1d71b65c1675176aa48d3f0e7a120..e2a3d5c9ec04f1e16a251a495fc884311a483b21 100644
--- a/api/api-archive-search/archive-search-internal/pom.xml
+++ b/api/api-archive-search/archive-search-internal/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-archive-search</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchivesSearchFieldsQueryBuilderService.java b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchivesSearchFieldsQueryBuilderService.java
index 19c23fd7bcb7e7e27738a7b6ded7744f86776943..ed35adec1b19b818895116219eeaa0cc6aaa5c44 100644
--- a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchivesSearchFieldsQueryBuilderService.java
+++ b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchivesSearchFieldsQueryBuilderService.java
@@ -74,6 +74,16 @@ public class ArchivesSearchFieldsQueryBuilderService implements IArchivesSearchA
searchCriteria.getValues().stream().map(value -> value.getValue()).collect(
Collectors.toList()),
ArchiveSearchConsts.CriteriaOperators.valueOf(searchCriteria.getOperator())));
+ } else if (ArchiveSearchConsts.TITLE_CRITERIA.equals(searchCriteria.getCriteria())) {
+ queryToFill.add(buildTitleQuery(
+ searchCriteria.getValues().stream().map(value -> value.getValue()).collect(
+ Collectors.toList()),
+ ArchiveSearchConsts.CriteriaOperators.valueOf(searchCriteria.getOperator())));
+ } else if (ArchiveSearchConsts.DESCRIPTION_CRITERIA.equals(searchCriteria.getCriteria())) {
+ queryToFill.add(buildDescriptionQuery(
+ searchCriteria.getValues().stream().map(value -> value.getValue()).collect(
+ Collectors.toList()),
+ ArchiveSearchConsts.CriteriaOperators.valueOf(searchCriteria.getOperator())));
} else {
String mappedCriteriaName =
ArchiveSearchConsts.SIMPLE_FIELDS_VALUES_MAPPING.containsKey(searchCriteria.getCriteria()) ?
@@ -90,6 +100,25 @@ public class ArchivesSearchFieldsQueryBuilderService implements IArchivesSearchA
}
private Query buildTitleAndDescriptionQuery(final List<String> searchValues,
+ ArchiveSearchConsts.CriteriaOperators operator)
+ throws InvalidCreateOperationException {
+ BooleanQuery subQueryAnd = and();
+ if (!CollectionUtils.isEmpty(searchValues)) {
+ for (String value : searchValues) {
+ BooleanQuery subQueryOr = or();
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE_FR, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE_EN, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION_EN, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION_FR, value, operator));
+ subQueryAnd.add(subQueryOr);
+ }
+ }
+ return subQueryAnd;
+ }
+
+ private Query buildTitleQuery(final List<String> searchValues,
ArchiveSearchConsts.CriteriaOperators operator)
throws InvalidCreateOperationException {
BooleanQuery subQueryAnd = and();
@@ -97,8 +126,26 @@ public class ArchivesSearchFieldsQueryBuilderService implements IArchivesSearchA
for (String value : searchValues) {
BooleanQuery subQueryOr = or();
subQueryOr
- .add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION, value, operator));
+ .add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE_FR, value, operator));
subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.TITLE_EN, value, operator));
+ subQueryAnd.add(subQueryOr);
+ }
+ }
+ return subQueryAnd;
+ }
+
+ private Query buildDescriptionQuery(final List<String> searchValues,
+ ArchiveSearchConsts.CriteriaOperators operator)
+ throws InvalidCreateOperationException {
+ BooleanQuery subQueryAnd = and();
+ if (!CollectionUtils.isEmpty(searchValues)) {
+ for (String value : searchValues) {
+ BooleanQuery subQueryOr = or();
+ subQueryOr
+ .add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION_EN, value, operator));
+ subQueryOr.add(VitamQueryHelper.buildSubQueryByOperator(ArchiveSearchConsts.DESCRIPTION_FR, value, operator));
subQueryAnd.add(subQueryOr);
}
}
diff --git a/api/api-archive-search/pom.xml b/api/api-archive-search/pom.xml
index d02490d57f8add4aea383860d06e47c76cf3cabc..797981fa4078a6233f4e4e1bc29a64d4664c0091 100644
--- a/api/api-archive-search/pom.xml
+++ b/api/api-archive-search/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-parent</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-iam/iam-commons/pom.xml b/api/api-iam/iam-commons/pom.xml
index 48c8a04359460bebe9af4454db4e76dd9194fc9c..44bba5b1e8b45f90eb755196288445ca15f527e5 100644
--- a/api/api-iam/iam-commons/pom.xml
+++ b/api/api-iam/iam-commons/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-external-client/pom.xml b/api/api-iam/iam-external-client/pom.xml
index 52e5a2d96f25e565c81b4a87c203052646e13c13..0b4be33577f8f742d115d4416a53b8d84d7c2df4 100644
--- a/api/api-iam/iam-external-client/pom.xml
+++ b/api/api-iam/iam-external-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-external/pom.xml b/api/api-iam/iam-external/pom.xml
index e30026db04127c78aea1f994b43dfc8eb9692cbc..053958ae232c49f68f87c340e8ada4b7abe73c7c 100644
--- a/api/api-iam/iam-external/pom.xml
+++ b/api/api-iam/iam-external/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-iam/iam-internal-client/pom.xml b/api/api-iam/iam-internal-client/pom.xml
index a0441aa31ef55bf7a16a81d5792e60b56c107bed..7bc4b981d53606c92fdc87d0ca01354fd9fbdd20 100644
--- a/api/api-iam/iam-internal-client/pom.xml
+++ b/api/api-iam/iam-internal-client/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-internal/pom.xml b/api/api-iam/iam-internal/pom.xml
index 60aef0b62b7a1f0b749040949fc005b81e5b6e85..28e644094bf617ee34fe2a047198ca37d813eacd 100644
--- a/api/api-iam/iam-internal/pom.xml
+++ b/api/api-iam/iam-internal/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-iam/iam-security/pom.xml b/api/api-iam/iam-security/pom.xml
index 19ee99a345cde1ea493c05d2bd75436e4a69c1b9..3b8d726477c761ea19d73291e6c87b150539552c 100644
--- a/api/api-iam/iam-security/pom.xml
+++ b/api/api-iam/iam-security/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/pom.xml b/api/api-iam/pom.xml
index b2c5355ed5b8d30fe977945fdd897919b98e84e2..be90ef161911d30a0bbf8bf2662227e67fd8d916 100644
--- a/api/api-iam/pom.xml
+++ b/api/api-iam/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/api/api-ingest/ingest-commons/pom.xml b/api/api-ingest/ingest-commons/pom.xml
index c80ff00d8b52c7bad79103df36f3acc99aca69a7..6d50d5144d40e4342c36e43fe1dfd7018ca50812 100644
--- a/api/api-ingest/ingest-commons/pom.xml
+++ b/api/api-ingest/ingest-commons/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-ingest</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-ingest/ingest-external-client/pom.xml b/api/api-ingest/ingest-external-client/pom.xml
index cd58bbd47f843318bb24682250c8e7f223b6a69c..4fc1b4be27f6d06b3c9bb69a7e4a0d12f22cc73e 100644
--- a/api/api-ingest/ingest-external-client/pom.xml
+++ b/api/api-ingest/ingest-external-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-ingest</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-ingest/ingest-external/pom.xml b/api/api-ingest/ingest-external/pom.xml
index eec15ffec25addd10dcd6b309cf65f6511705946..ff53954c78b23ca5eebc9e6c64f9f6e0b7c3dc5a 100644
--- a/api/api-ingest/ingest-external/pom.xml
+++ b/api/api-ingest/ingest-external/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-ingest</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-ingest/ingest-internal-client/pom.xml b/api/api-ingest/ingest-internal-client/pom.xml
index 1ce3644f270c74bf68eb2e0e339c3301007d9d67..bd526c0987021880e29f0d1a817d54679af19e8f 100644
--- a/api/api-ingest/ingest-internal-client/pom.xml
+++ b/api/api-ingest/ingest-internal-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-ingest</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-ingest/ingest-internal/pom.xml b/api/api-ingest/ingest-internal/pom.xml
index 56e2733a466cfc8f1c26c5fe5b31061ad5185324..3c3474af897215be3eaa783cfb94f4a4b54d90a5 100644
--- a/api/api-ingest/ingest-internal/pom.xml
+++ b/api/api-ingest/ingest-internal/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-ingest</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-ingest/pom.xml b/api/api-ingest/pom.xml
index 2a63a9fcdcc3df52589b7cffe922c443dc5fec4b..ad790d980a85d9f9f84f7dcf97020a35192be079 100644
--- a/api/api-ingest/pom.xml
+++ b/api/api-ingest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>api-parent</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/api/api-referential/pom.xml b/api/api-referential/pom.xml
index 6c0e31ae7462c671e7e582182e31e9d6e4cd6960..ea5497d4f0b8b219479dcb89cc4064f5939f78e5 100644
--- a/api/api-referential/pom.xml
+++ b/api/api-referential/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/api/api-referential/referential-commons/pom.xml b/api/api-referential/referential-commons/pom.xml
index 53ae53b645032b6fda0f610ca0479c4e104cdcea..105ebf3cf8085e6693cfbd855230fd6b84b768e4 100644
--- a/api/api-referential/referential-commons/pom.xml
+++ b/api/api-referential/referential-commons/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-referential</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-referential/referential-external-client/pom.xml b/api/api-referential/referential-external-client/pom.xml
index 2b132ff5d69c90f564666fb85b741055d26b061e..d0debbcd4c0cf98ca9d963bb5e0349667bdcedf2 100644
--- a/api/api-referential/referential-external-client/pom.xml
+++ b/api/api-referential/referential-external-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-referential</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-referential/referential-external/pom.xml b/api/api-referential/referential-external/pom.xml
index eea53588842e422b9f8a735ad251cc6ad6d53343..ab4b79921397d9c2e37a16a2e82376d9271e34a4 100644
--- a/api/api-referential/referential-external/pom.xml
+++ b/api/api-referential/referential-external/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-referential</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-referential/referential-internal-client/pom.xml b/api/api-referential/referential-internal-client/pom.xml
index aa46ff552034481829be492cdd044f1d16d1442d..cb03caa3202297835522dac261a956b4dbe7a4d2 100644
--- a/api/api-referential/referential-internal-client/pom.xml
+++ b/api/api-referential/referential-internal-client/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-referential</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-referential/referential-internal/pom.xml b/api/api-referential/referential-internal/pom.xml
index 35f3d6f21f8b30da5943d7c01f41f047c953dece..da45effc81409778203ec245cdbc42bad01184a5 100644
--- a/api/api-referential/referential-internal/pom.xml
+++ b/api/api-referential/referential-internal/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-referential</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-security/pom.xml b/api/api-security/pom.xml
index 8248f798da8d3e84075a58ca832700d7de9f94ea..cde9b044e015f00978dae1d4701701872a48deb5 100644
--- a/api/api-security/pom.xml
+++ b/api/api-security/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/api/api-security/security-client/pom.xml b/api/api-security/security-client/pom.xml
index 1da1e10967284eaae59cb180b34afd06db35127e..bddc6a8d4da45d10bd99276792f5b42a92701723 100644
--- a/api/api-security/security-client/pom.xml
+++ b/api/api-security/security-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-security/security-commons/pom.xml b/api/api-security/security-commons/pom.xml
index 99dd10b660cb44ef02081fcd6cfc75f2df30c6b6..f56de763e992f2f4f8ebac8e6ce67b4926f40782 100644
--- a/api/api-security/security-commons/pom.xml
+++ b/api/api-security/security-commons/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-security/security-internal/pom.xml b/api/api-security/security-internal/pom.xml
index 9e5e67f33a3da5d72779db2f26fb1ef7f764f668..e31c483325ca0bccc825c0e2f5bbbdc00415a0f9 100644
--- a/api/api-security/security-internal/pom.xml
+++ b/api/api-security/security-internal/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/pom.xml b/api/pom.xml
index 611dd367dac3158d0510fab660d1d05810cedeb7..8ff6dffbcd56ccfcbd2124e7c64f565dccd9572f 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index e80544a8d8ef852b9a5283296eab028bb211d15d..11440b5beaa53bb17fbbd3ad9cafdad2087c4c66 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cas</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<artifactId>cas-server</artifactId>
<packaging>war</packaging>
diff --git a/cas/pom.xml b/cas/pom.xml
index 7315fe0d86c3784aa477c328e2485f4da778ef9f..03f3a5a2798e15e88999f3894c1bbc9807d94009 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<artifactId>cas</artifactId>
<packaging>pom</packaging>
diff --git a/commons/commons-api/pom.xml b/commons/commons-api/pom.xml
index 5625a7e2d094f6af7d39bbc362e0eaf9d11d5f09..70cdcca108df689f123e45945125a443599e7926 100644
--- a/commons/commons-api/pom.xml
+++ b/commons/commons-api/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-logbook/pom.xml b/commons/commons-logbook/pom.xml
index 8ac497f53b7a8fc82dff2ddd7e27841317f03862..e57b8e4c2625f4d492f8dbf3bc74e86c79795d34 100644
--- a/commons/commons-logbook/pom.xml
+++ b/commons/commons-logbook/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-mongo/pom.xml b/commons/commons-mongo/pom.xml
index df2949a84105cc72fa43df71e38568ff53cb70c7..64fd8fcadc8f8a566ec9a0fbb4b2570e66af70f9 100644
--- a/commons/commons-mongo/pom.xml
+++ b/commons/commons-mongo/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-rest/pom.xml b/commons/commons-rest/pom.xml
index 4710ea473f107c9586b7059dd6ccb83c8954e39c..5f057c7049423b6916293e31c78f4dedd940551b 100644
--- a/commons/commons-rest/pom.xml
+++ b/commons/commons-rest/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-security/pom.xml b/commons/commons-security/pom.xml
index 0308e859c285eddc229e6665e9ac8cd663793a95..c177ef2bfbebbb30b3ef17a6ec3a21aa85833ad0 100644
--- a/commons/commons-security/pom.xml
+++ b/commons/commons-security/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-test/pom.xml b/commons/commons-test/pom.xml
index f2bd19c81082b606ae71bfb461b69bc7493accb5..4d3a2e898fab8b0bca5f95357cdd5cf13f977033 100644
--- a/commons/commons-test/pom.xml
+++ b/commons/commons-test/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-utils/pom.xml b/commons/commons-utils/pom.xml
index b532418d40e036ef73997a07f899d4699886a3c7..50a74d21f0e28b2e3b0f80470f3c429ebefe4348 100644
--- a/commons/commons-utils/pom.xml
+++ b/commons/commons-utils/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-vitam/pom.xml b/commons/commons-vitam/pom.xml
index 9ecbab88b387ad7a778125b2e54957387648bbe1..362b5b5aa228991f9d357ee64e8278b8f5fba76b 100644
--- a/commons/commons-vitam/pom.xml
+++ b/commons/commons-vitam/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/DescriptionDto.java b/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/DescriptionDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..f5900e87561d5145bc2d099372cc25355f4029e9
--- /dev/null
+++ b/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/DescriptionDto.java
@@ -0,0 +1,58 @@
+/*
+ * *
+ * * Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020)
+ * * and the signatories of the "VITAM - Accord du Contributeur" agreement.
+ * *
+ * * contact@programmevitam.fr
+ * *
+ * * This software is a computer program whose purpose is to implement
+ * * implement a digital archiving front-office system for the secure and
+ * * efficient high volumetry VITAM solution.
+ * *
+ * * This software is governed by the CeCILL-C license under French law and
+ * * abiding by the rules of distribution of free software. You can use,
+ * * modify and/ or redistribute the software under the terms of the CeCILL-C
+ * * license as circulated by CEA, CNRS and INRIA at the following URL
+ * * "http://www.cecill.info".
+ * *
+ * * As a counterpart to the access to the source code and rights to copy,
+ * * modify and redistribute granted by the license, users are provided only
+ * * with a limited warranty and the software's author, the holder of the
+ * * economic rights, and the successive licensors have only limited
+ * * liability.
+ * *
+ * * In this respect, the user's attention is drawn to the risks associated
+ * * with loading, using, modifying and/or developing or reproducing the
+ * * software by the user in light of its specific status of free software,
+ * * that may mean that it is complicated to manipulate, and that also
+ * * therefore means that it is reserved for developers and experienced
+ * * professionals having in-depth computer knowledge. Users are therefore
+ * * encouraged to load and test the software's suitability as regards their
+ * * requirements in conditions enabling the security of their systems and/or
+ * * data to be ensured and, more generally, to use and operate it in the
+ * * same conditions as regards security.
+ * *
+ * * The fact that you are presently reading this means that you have had
+ * * knowledge of the CeCILL-C license and that you accept its terms.
+ *
+ */
+
+package fr.gouv.vitamui.commons.vitam.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class DescriptionDto {
+
+
+ @JsonProperty("fr")
+ private String fr;
+
+ @JsonProperty("en")
+ private String en;
+}
diff --git a/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/ResultsDto.java b/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/ResultsDto.java
index 820ba3ca67ec2905e46945b57abc4381278ed621..807528e5a04f195b5e60d8606a6a1172911b6eaa 100644
--- a/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/ResultsDto.java
+++ b/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/dto/ResultsDto.java
@@ -73,6 +73,9 @@ public class ResultsDto {
@JsonProperty("Description")
private String description;
+ @JsonProperty("Description_")
+ private DescriptionDto description_;
+
@JsonProperty("OriginatingAgencyArchiveUnitIdentifier")
private List<String> originatingAgencyArchiveUnitIdentifier = new ArrayList<>();
diff --git a/commons/pom.xml b/commons/pom.xml
index a76a1860801690768e8d53738c49f0287fa4cba8..c6fe81135ff370e8577765d988e92ec5c1a7594f 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<artifactId>commons-parent</artifactId>
diff --git a/cots/pom.xml b/cots/pom.xml
index 6fd0a8c0253ebf5e38c135ab0ecf7206925f0ad9..11e5acf70b92178ac3952d9633b6e86a80d0dbcf 100644
--- a/cots/pom.xml
+++ b/cots/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/cots/vitamui-logstash/pom.xml b/cots/vitamui-logstash/pom.xml
index 106a81261a32cfc5d45431f78f99e558b10509d9..3f6e3bb64b9d4659e488358ce893a744a52ea5f0 100644
--- a/cots/vitamui-logstash/pom.xml
+++ b/cots/vitamui-logstash/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/cots/vitamui-mongo-express/pom.xml b/cots/vitamui-mongo-express/pom.xml
index 28a55c44095376f66a84c2e6b4c59c5ce49f58fe..29c9537e347bad77d62fef620a4e75c00d58e717 100644
--- a/cots/vitamui-mongo-express/pom.xml
+++ b/cots/vitamui-mongo-express/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/cots/vitamui-mongod/pom.xml b/cots/vitamui-mongod/pom.xml
index 054ea12337be94e090bf82a9b448b4dbeb8953cb..91e8c5bf79ca2f866e272cbe36a31eb541b782f5 100644
--- a/cots/vitamui-mongod/pom.xml
+++ b/cots/vitamui-mongod/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/cots/vitamui-nginx/pom.xml b/cots/vitamui-nginx/pom.xml
index af42ff11b0461737321af444c41e67d45a4ebdd1..18286cf0223875670a0fa842233d171739a3e5af 100644
--- a/cots/vitamui-nginx/pom.xml
+++ b/cots/vitamui-nginx/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 90ac2781b13bc767c83f486abd8a4cb92dce0a2e..035e51dbe13a5a6841a991d92ffce2cac80b6ce1 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<artifactId>deployment</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4603149e72ccc349c1af6c007b300b10f18fed31..9ad323f4d1ad93972c8d3b5350cb79776a8fe884 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index a165b58bc2b7b422fac2eb5a412c636142a0eb87..083f3d7a819cc0fd6eda2589c5ed6ed1497bbb8e 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>package</artifactId>
diff --git a/pom.xml b/pom.xml
index 277fd84143c5aa7ed224ecd1ec0edf5fe9c6ba50..47f88719b92cd2054115c88cdeed7bca8db9b274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VITAMUI</name>
<description>${project.artifactId}</description>
diff --git a/ui/pom.xml b/ui/pom.xml
index 0166df69ae0afebf0e849d11bc6f942a3389d690..50bc8ca46063febd595966fe6afe7725ed72cb14 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/ui/ui-archive-search/pom.xml b/ui/ui-archive-search/pom.xml
index 99197c65e315a9b0452912d27727318f1d14b11f..af35d89a527a2acc06eaa836d013f23b58f6d856 100644
--- a/ui/ui-archive-search/pom.xml
+++ b/ui/ui-archive-search/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ui-parent</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ui/ui-commons/pom.xml b/ui/ui-commons/pom.xml
index 97e59bedaea7b32f83e3c759aad2626d549e6dfe..7d3460ff28f89af1741e193169c595bbdb0597f3 100644
--- a/ui/ui-commons/pom.xml
+++ b/ui/ui-commons/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-frontend-common/pom.xml b/ui/ui-frontend-common/pom.xml
index 996ada5f647670ceb861cc7779f0582a74f5eae9..ed49c8ad7a887ab289fa1cbf8a7c6e45335951b6 100644
--- a/ui/ui-frontend-common/pom.xml
+++ b/ui/ui-frontend-common/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-frontend/pom.xml b/ui/ui-frontend/pom.xml
index 00dbd199dec49009c3f3b32b821b61870300ce9b..f4bd42da0ed0e6be16575e5851377e9dbc4b2969 100644
--- a/ui/ui-frontend/pom.xml
+++ b/ui/ui-frontend/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.html b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.html
index db1dc0e7062095355a30ee217b5350999065a323..3b2a0f4f62f72f86112abfbb8ae76f9f034941d5 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.html
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.html
@@ -57,9 +57,19 @@
<div class="read-only-field text-justify">
<label>{{ 'ARCHIVE_SEARCH.ARCHIVE_UNIT_PREVIEW.FIELDS.DESCRIPTION' | translate }} :</label>
<div>
- <p class="text-justify">
- {{ archiveUnit.Description }}
- </p>
+ <ng-container *ngIf="archiveUnit?.Description; else descriptionFr">
+ {{ archiveUnit?.Description }}
+ </ng-container>
+ <ng-template #descriptionFr>
+ <ng-container *ngIf="archiveUnit.Description_.fr; else descriptionEn">
+ {{ archiveUnit.Description_.fr }}
+ </ng-container>
+ </ng-template>
+ <ng-template #descriptionEn>
+ <ng-container *ngIf="archiveUnit.Description_.en">
+ {{ archiveUnit.Description_.en }}
+ </ng-container>
+ </ng-template>
</div>
</div>
</div>
@@ -102,9 +112,9 @@
</div>
<div class="col-6">
<div class="read-only-field">
- <label>{{'ARCHIVE_SEARCH.ARCHIVE_UNIT_PREVIEW.FIELDS.DESCRIPTION_LEVEL' | translate}} :</label>
+ <label>{{ 'ARCHIVE_SEARCH.ARCHIVE_UNIT_PREVIEW.FIELDS.DESCRIPTION_LEVEL' | translate }} :</label>
<div>
- {{archiveUnit.DescriptionLevel}}
+ {{ archiveUnit.DescriptionLevel }}
</div>
</div>
</div>
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.spec.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.spec.ts
index 88b26531a72fde18bafeb52d6d3b17bcff59586a..c1313222a04f5736ad4ca6b039f7c9635bf60934 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.spec.ts
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.spec.ts
@@ -36,26 +36,21 @@
*/
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatTreeModule } from '@angular/material/tree';
-
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ActivatedRoute } from '@angular/router';
-
import { RouterTestingModule } from '@angular/router/testing';
-import { environment } from '../../../environments/environment.prod';
+import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
-
import { BASE_URL, ENVIRONMENT, InjectorModule, LoggerModule, StartupService, WINDOW_LOCATION } from 'ui-frontend-common';
+import { environment } from '../../../environments/environment.prod';
+import { ArchiveService } from '../archive.service';
import { Unit } from '../models/unit.interface';
-
import { ArchivePreviewComponent } from './archive-preview.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ArchiveService } from '../archive.service';
describe('ArchivePreviewComponent', () => {
let component: ArchivePreviewComponent;
@@ -103,7 +98,7 @@ describe('ArchivePreviewComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(ArchivePreviewComponent);
component = fixture.componentInstance;
- let archiveUnit: Unit = {
+ const archiveUnit: Unit = {
'#allunitups': [],
'#id': 'id',
'#object': '',
@@ -111,6 +106,7 @@ describe('ArchivePreviewComponent', () => {
'#unitups': [],
'#opi': '',
Title_: { fr: 'Teste', en: 'Test' },
+ Description_: { fr: 'DescriptionFr', en: 'DescriptionEn' },
};
component.archiveUnit = archiveUnit;
fixture.detectChanges();
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
index 05f1525a1b21f4287e523e47228e4376f17caf90..38482192ece62c77ab8cc56ea5f4222cf0f745be 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html
@@ -180,9 +180,13 @@
>
{{ 'ARCHIVE_SEARCH.DIP.EXPORT_DIP' | translate }}
</button>
- <button mat-menu-item (click)="startEliminationAnalysis()" [disabled]="!hasEliminationAnalysisRole || (hasEliminationAnalysisRole && itemSelected == 0)">
- {{ 'ARCHIVE_SEARCH.ELIMINATION.ANALYSIS' | translate }}
- </button>
+ <button
+ mat-menu-item
+ (click)="startEliminationAnalysis()"
+ [disabled]="!hasEliminationAnalysisRole || (hasEliminationAnalysisRole && itemSelected == 0)"
+ >
+ {{ 'ARCHIVE_SEARCH.ELIMINATION.ANALYSIS' | translate }}
+ </button>
</vitamui-common-menu-button>
</div>
</div>
@@ -382,17 +386,17 @@
</ng-container>
<ng-template #subTitleFr>
<ng-container *ngIf="archiveUnit.Title_.fr; else subTitleEn">
- <p matTooltip="{{ archiveUnit?.Description }}" matTooltipClass="vitamui-tooltip" [matTooltipShowDelay]="300">
+ <p matTooltip="{{ archiveUnit?.Description_.fr }}" matTooltipClass="vitamui-tooltip" [matTooltipShowDelay]="300">
<b>{{ archiveUnit.Title_.fr }} </b> <br />
- {{ archiveUnit?.Description | truncate: 100 }}
+ {{ archiveUnit?.Description_.fr | truncate: 100 }}
</p>
</ng-container>
</ng-template>
<ng-template #subTitleEn>
<ng-container *ngIf="archiveUnit.Title_.en">
- <p matTooltip="{{ archiveUnit?.Description }}" matTooltipClass="vitamui-tooltip" [matTooltipShowDelay]="300">
+ <p matTooltip="{{ archiveUnit?.Description_.en }}" matTooltipClass="vitamui-tooltip" [matTooltipShowDelay]="300">
<b>{{ archiveUnit.Title_.en }} </b> <br />
- {{ archiveUnit?.Description | truncate: 100 }}
+ {{ archiveUnit?.Description_.en | truncate: 100 }}
</p>
</ng-container>
</ng-template>
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/unit.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/unit.interface.ts
index 1247a8228dfa75755713c8f1710e95994fa10af1..a37ca8d7832878536d083c5f48c0a1c62e25b15d 100644
--- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/unit.interface.ts
+++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/unit.interface.ts
@@ -10,6 +10,7 @@ export interface Unit {
Title?: string;
Title_?: any;
Description?: string;
+ Description_?: any;
DescriptionLevel?: string;
CreatedDate?: Date;
StartDate?: Date;
@@ -23,8 +24,8 @@ export interface Unit {
DuaEndDate?: Date;
OriginatingAgencyArchiveUnitIdentifier?: string;
Status?: string;
- Vtag?: Array<{ Key: string[], Value: string[] }>;
- Keyword?: Array<{ KeywordReference: string, KeywordContent: string }>;
+ Vtag?: Array<{ Key: string[]; Value: string[] }>;
+ Keyword?: Array<{ KeywordReference: string; KeywordContent: string }>;
Type?: string;
PhysicalAgency?: string[];
PhysicalStatus?: string[];
@@ -35,5 +36,4 @@ export interface Unit {
isPhysical?: boolean;
[key: string]: any;
-
}
diff --git a/ui/ui-frontend/projects/referential/src/app/file-format/file-format-preview/file-format-information-tab/file-format-information-tab.component.ts b/ui/ui-frontend/projects/referential/src/app/file-format/file-format-preview/file-format-information-tab/file-format-information-tab.component.ts
index 5d45d590a1259a59da3ced535158f9aaf2e49786..7c54bd79e67e2dd00e38ea83518c6eea99462ef3 100644
--- a/ui/ui-frontend/projects/referential/src/app/file-format/file-format-preview/file-format-information-tab/file-format-information-tab.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/file-format/file-format-preview/file-format-information-tab/file-format-information-tab.component.ts
@@ -64,7 +64,14 @@ export class FileFormatInformationTabComponent {
private _fileFormat: FileFormat;
previousValue = (): FileFormat => {
- return this._fileFormat;
+ var cleanedFileFortmat = this._fileFormat;
+ if (!cleanedFileFortmat.mimeType) {
+ cleanedFileFortmat.mimeType = null;
+ }
+ if (!cleanedFileFortmat.extensions) {
+ cleanedFileFortmat.extensions = null;
+ }
+ return cleanedFileFortmat;
}
@Input()
@@ -127,6 +134,8 @@ export class FileFormatInformationTabComponent {
if (formData.extensions) {
// The extensions property must be an array of string, not a string
formData.extensions = formData.extensions.replace(/\s/g, '').split(',');
+ } else if(isEmpty(formData.extensions)){
+ formData.extensions = [];
}
return this.fileFormatService.patch(formData).pipe(catchError(() => of(null)))
}));
diff --git a/ui/ui-identity/pom.xml b/ui/ui-identity/pom.xml
index 2b61827dff2c5a0b608b543c96328e56025fb0f2..68d18b62ff00379522366d0a77cf18bc4cb92919 100644
--- a/ui/ui-identity/pom.xml
+++ b/ui/ui-identity/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-ingest/pom.xml b/ui/ui-ingest/pom.xml
index 95f5782d4a7d28e6615723546e3de0a05e49f2ce..dc0fb6bc05f4a0022490d9110cbf21ffeeb054ba 100644
--- a/ui/ui-ingest/pom.xml
+++ b/ui/ui-ingest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ui-parent</artifactId>
<groupId>fr.gouv.vitamui</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ui/ui-portal/pom.xml b/ui/ui-portal/pom.xml
index a8111bcd76634990d9b38b01bfd0beac4c4b0e80..14a7188c336b3b0cb21292ba7e5de7e2a7dff60c 100644
--- a/ui/ui-portal/pom.xml
+++ b/ui/ui-portal/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-referential/pom.xml b/ui/ui-referential/pom.xml
index 9f34ebcb6d07b19ddef2791475563ba9c88a116e..466564e7c36e0fae569049815b9001a6da15bf33 100644
--- a/ui/ui-referential/pom.xml
+++ b/ui/ui-referential/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<properties>