Merge branch 'develop' into cines_feature_pastis_integration (6c0dc91a) · Commits · dad / Cines Vitamui

Commit 6c0dc91a authored 3 years ago by

descamps

Merge branch 'develop' into cines_feature_pastis_integration

# Conflicts:
#	ui/ui-frontend/package-lock.json

parents 231d427c c17e2858

No related branches found

No related tags found

5 merge requests!58compare branch,!54Comparaison de merge vers vitam-ui,!53Comparaison de merge vers vitam-ui,!52Voir difference entre les deux verion,!41MAJ: compare to vitam-ui

Hide whitespace changes

Inline Side-by-side

Showing

api/api-archive-search/archive-search-commons/pom.xml 1 addition, 0 deletions

api/api-archive-search/archive-search-commons/pom.xml
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java 13 additions, 6 deletions

.../vitamui/archives/search/common/dsl/VitamQueryHelper.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ArchiveUnitCsv.java 33 additions, 0 deletions

...uv/vitamui/archives/search/common/dto/ArchiveUnitCsv.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportSearchResultParam.java 72 additions, 0 deletions

...i/archives/search/common/dto/ExportSearchResultParam.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/SearchCriteriaDto.java 2 additions, 0 deletions

...vitamui/archives/search/common/dto/SearchCriteriaDto.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/rest/RestApi.java 1 addition, 0 deletions

.../fr/gouv/vitamui/archives/search/common/rest/RestApi.java
api/api-archive-search/archive-search-external-client/src/main/java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClient.java 17 additions, 4 deletions

...arch/external/client/ArchiveSearchExternalRestClient.java
api/api-archive-search/archive-search-external-client/src/test/java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClientTest.java 27 additions, 0 deletions

.../external/client/ArchiveSearchExternalRestClientTest.java
api/api-archive-search/archive-search-external-client/src/test/resources/data/vitam_archive_units_response.csv 3 additions, 0 deletions

.../src/test/resources/data/vitam_archive_units_response.csv
api/api-archive-search/archive-search-external/src/main/java/fr/gouv/vitamui/archives/search/external/server/rest/ArchivesSearchExternalController.java 9 additions, 0 deletions

...xternal/server/rest/ArchivesSearchExternalController.java
api/api-archive-search/archive-search-external/src/main/java/fr/gouv/vitamui/archives/search/external/server/service/ArchivesSearchExternalService.java 4 additions, 1 deletion

...xternal/server/service/ArchivesSearchExternalService.java
api/api-archive-search/archive-search-external/src/test/java/fr/gouv/vitamui/archives/search/external/server/rest/ArchivesSearchExternalControllerTest.java 26 additions, 0 deletions

...nal/server/rest/ArchivesSearchExternalControllerTest.java
api/api-archive-search/archive-search-external/src/test/resources/data/vitam_archive_units_response.csv 3 additions, 0 deletions

.../src/test/resources/data/vitam_archive_units_response.csv
api/api-archive-search/archive-search-internal-client/src/main/java/fr/gouv/archive/internal/client/ArchiveInternalRestClient.java 14 additions, 2 deletions

...uv/archive/internal/client/ArchiveInternalRestClient.java
api/api-archive-search/archive-search-internal-client/src/test/java/fr/gouv/archive/internal/client/ArchiveInternalRestClientTest.java 26 additions, 0 deletions

...rchive/internal/client/ArchiveInternalRestClientTest.java
api/api-archive-search/archive-search-internal-client/src/test/resources/data/vitam_archive_units_response.csv 3 additions, 0 deletions

.../src/test/resources/data/vitam_archive_units_response.csv
api/api-archive-search/archive-search-internal/pom.xml 5 additions, 0 deletions

api/api-archive-search/archive-search-internal/pom.xml
api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveSearchInternalServerConfig.java 1 addition, 1 deletion

...rnal/server/config/ArchiveSearchInternalServerConfig.java
api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalController.java 42 additions, 17 deletions

...internal/server/rest/ArchiveSearchInternalController.java
api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchAgenciesInternalService.java 205 additions, 0 deletions

.../server/service/ArchiveSearchAgenciesInternalService.java

with 507 additions and 31 deletions

Please register or to comment