diff --git a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveInternalServerConfig.java b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveSearchInternalServerConfig.java similarity index 98% rename from api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveInternalServerConfig.java rename to api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveSearchInternalServerConfig.java index 3eab53423b8cac1b6aafe3ed2bb5d0a2a13b02a0..9cd9a8809cc8368891678473b5ca4ff43a166434 100644 --- a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveInternalServerConfig.java +++ b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/config/ArchiveSearchInternalServerConfig.java @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Import; @Import({RestExceptionHandler.class, SwaggerConfiguration.class, fr.gouv.vitamui.archive.internal.server.security.WebSecurityConfig.class, VitamAccessConfig.class, VitamAdministrationConfig.class, ConverterConfig.class}) -public class ArchiveInternalServerConfig extends AbstractContextConfiguration { +public class ArchiveSearchInternalServerConfig extends AbstractContextConfiguration { @Bean @ConfigurationProperties(prefix = "clients.iam-internal") diff --git a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalController.java b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalController.java similarity index 95% rename from api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalController.java rename to api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalController.java index 357dca944e62e9a4bed987f62a79908b4e04b992..a7363beca630d4f5f842407cb23de4b865e75a5f 100644 --- a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalController.java +++ b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalController.java @@ -34,7 +34,7 @@ import fr.gouv.vitam.common.database.builder.request.exception.InvalidCreateOper import fr.gouv.vitam.common.database.builder.request.multiple.SelectMultiQuery; import fr.gouv.vitam.common.exception.InvalidParseOperationException; import fr.gouv.vitam.common.exception.VitamClientException; -import fr.gouv.vitamui.archive.internal.server.service.ArchiveInternalService; +import fr.gouv.vitamui.archive.internal.server.service.ArchiveSearchInternalService; import fr.gouv.vitamui.archives.search.common.dto.ArchiveUnitsDto; import fr.gouv.vitamui.archives.search.common.dto.SearchCriteriaDto; import fr.gouv.vitamui.archives.search.common.rest.RestApi; @@ -74,15 +74,15 @@ import static fr.gouv.vitam.common.database.builder.query.VitamFieldsHelper.unit @Getter @Setter @Api(tags = "archives search", value = "Archives units search") -public class ArchiveInternalController { +public class ArchiveSearchInternalController { private static final VitamUILogger LOGGER = - VitamUILoggerFactory.getInstance(ArchiveInternalController.class); + VitamUILoggerFactory.getInstance(ArchiveSearchInternalController.class); private static final String[] FILING_PLAN_PROJECTION = new String[] {"#id", "Title", "Title_", "DescriptionLevel", "#unitType", "#unitups", "#allunitups"}; - private ArchiveInternalService archiveInternalService; + private ArchiveSearchInternalService archiveInternalService; private InternalSecurityService securityService; @@ -90,7 +90,7 @@ public class ArchiveInternalController { private ObjectMapper objectMapper; @Autowired - public ArchiveInternalController(final ArchiveInternalService archiveInternalService, + public ArchiveSearchInternalController(final ArchiveSearchInternalService archiveInternalService, final InternalSecurityService securityService) { this.archiveInternalService = archiveInternalService; this.securityService = securityService; diff --git a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalService.java b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalService.java similarity index 98% rename from api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalService.java rename to api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalService.java index f0b9b1546b9ba2124d3578e02fd159c8ba060374..e26ed129d5319bd5f590ad542268ea93f36e39fd 100644 --- a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalService.java +++ b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalService.java @@ -72,9 +72,9 @@ import java.util.stream.Collectors; * Archive-Search Internal service communication with VITAM. */ @Service -public class ArchiveInternalService { +public class ArchiveSearchInternalService { private static final VitamUILogger LOGGER = - VitamUILoggerFactory.getInstance(ArchiveInternalService.class); + VitamUILoggerFactory.getInstance(ArchiveSearchInternalService.class); public static final String INGEST_ARCHIVE_TYPE = "INGEST"; public static final String ORIGINATING_AGENCY_LABEL_FIELD = "originating_agency_label"; public static final String ORIGINATING_AGENCY_ID_FIELD = "#originating_agency"; @@ -90,7 +90,7 @@ public class ArchiveInternalService { final private AgencyService agencyService; @Autowired - public ArchiveInternalService(final ObjectMapper objectMapper, final UnitService unitService, + public ArchiveSearchInternalService(final ObjectMapper objectMapper, final UnitService unitService, final AgencyService agencyService) { this.unitService = unitService; this.objectMapper = objectMapper; diff --git a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveInternalServerConfigTest.java b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveSearchInternalServerConfigTest.java similarity index 91% rename from api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveInternalServerConfigTest.java rename to api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveSearchInternalServerConfigTest.java index b2584cd412f8afecb1139dfe3a5f18894df43d13..b13b7f7200b5255d681b75f2e3fb685f8377fa58 100644 --- a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveInternalServerConfigTest.java +++ b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/config/ApiArchiveSearchInternalServerConfigTest.java @@ -29,7 +29,7 @@ package fr.gouv.vitamui.archive.internal.server.config; import fr.gouv.vitam.access.external.client.AccessExternalClient; import fr.gouv.vitam.access.external.client.AdminExternalClient; import fr.gouv.vitam.ingest.external.client.IngestExternalClient; -import fr.gouv.vitamui.archive.internal.server.service.ArchiveInternalService; +import fr.gouv.vitamui.archive.internal.server.service.ArchiveSearchInternalService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK) @TestPropertySource(properties = {"spring.config.name=archive-search-internal-application"}) @ActiveProfiles("test") -public class ApiArchiveInternalServerConfigTest { +public class ApiArchiveSearchInternalServerConfigTest { @MockBean(name = "adminExternalClient") private AdminExternalClient adminExternalClient; @@ -57,10 +57,10 @@ public class ApiArchiveInternalServerConfigTest { private IngestExternalClient ingestExternalClient; @Autowired - private ArchiveInternalService archiveInternalService; + private ArchiveSearchInternalService archiveSearchInternalService; @Test public void testArchiveInternalConf() { - Assert.assertNotNull(archiveInternalService); + Assert.assertNotNull(archiveSearchInternalService); } } diff --git a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/doc/SwaggerJsonFileGenerationTest.java b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/doc/SwaggerJsonFileGenerationTest.java index 7fa0dde059fc2c73d1c3e65bfb01520d3bb45c90..43847398c5204783d41d72ed005c3a212059855a 100644 --- a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/doc/SwaggerJsonFileGenerationTest.java +++ b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/doc/SwaggerJsonFileGenerationTest.java @@ -30,7 +30,7 @@ package fr.gouv.vitamui.archive.internal.server.doc; import fr.gouv.vitam.access.external.client.AccessExternalClient; import fr.gouv.vitam.access.external.client.AdminExternalClient; import fr.gouv.vitamui.archive.internal.server.service.AccessContractTempInternalService; -import fr.gouv.vitamui.archive.internal.server.service.ArchiveInternalService; +import fr.gouv.vitamui.archive.internal.server.service.ArchiveSearchInternalService; import fr.gouv.vitamui.commons.api.identity.ServerIdentityConfiguration; import fr.gouv.vitamui.commons.rest.RestExceptionHandler; import fr.gouv.vitamui.commons.rest.configuration.SwaggerConfiguration; @@ -72,7 +72,7 @@ public class SwaggerJsonFileGenerationTest extends AbstractSwaggerJsonFileGenera private AuthenticationProvider authenticationProvider; @MockBean - private ArchiveInternalService archiveInternalService; + private ArchiveSearchInternalService archiveSearchInternalService; @MockBean private AccessContractTempInternalService accessContractTempInternalService; diff --git a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalControllerTest.java b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalControllerTest.java similarity index 92% rename from api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalControllerTest.java rename to api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalControllerTest.java index 6ab30c7f7c4a259c422792ccd71c1e3fe88f817f..d76648a0e1e5ac27f0b7c30bf0214450d1876cff 100644 --- a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveInternalControllerTest.java +++ b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/rest/ArchiveSearchInternalControllerTest.java @@ -29,7 +29,7 @@ package fr.gouv.vitamui.archive.internal.server.rest; import fr.gouv.vitam.access.external.client.AccessExternalClient; import fr.gouv.vitam.access.external.client.AdminExternalClient; import fr.gouv.vitam.ingest.external.client.IngestExternalClient; -import fr.gouv.vitamui.archive.internal.server.service.ArchiveInternalService; +import fr.gouv.vitamui.archive.internal.server.service.ArchiveSearchInternalService; import fr.gouv.vitamui.commons.rest.RestExceptionHandler; import fr.gouv.vitamui.commons.test.utils.ServerIdentityConfigurationBuilder; import fr.gouv.vitamui.iam.security.provider.InternalApiAuthenticationProvider; @@ -45,9 +45,9 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@WebMvcTest(controllers = {ArchiveInternalControllerTest.class}) +@WebMvcTest(controllers = {ArchiveSearchInternalControllerTest.class}) @ActiveProfiles("test") -public class ArchiveInternalControllerTest { +public class ArchiveSearchInternalControllerTest { @MockBean(name = "adminExternalClient") @@ -69,7 +69,7 @@ public class ArchiveInternalControllerTest { private RestExceptionHandler restExceptionHandler; @InjectMocks - private ArchiveInternalService archiveInternalService; + private ArchiveSearchInternalService archiveSearchInternalService; @BeforeClass public static void setup() { diff --git a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalServiceTest.java b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalServiceTest.java similarity index 92% rename from api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalServiceTest.java rename to api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalServiceTest.java index b5c4ad37b1658ba234a8f802b05b6cbae2739799..2ce1edeb67f93d6c37c431f513be3b26180f55a8 100644 --- a/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveInternalServiceTest.java +++ b/api/api-archive-search/archive-search-internal/src/test/java/fr/gouv/vitamui/archive/internal/server/service/ArchiveSearchInternalServiceTest.java @@ -64,10 +64,10 @@ import static org.mockito.Mockito.when; @RunWith(SpringRunner.class) @ActiveProfiles("test") -public class ArchiveInternalServiceTest { +public class ArchiveSearchInternalServiceTest { private static final VitamUILogger LOGGER = - VitamUILoggerFactory.getInstance(ArchiveInternalServiceTest.class); + VitamUILoggerFactory.getInstance(ArchiveSearchInternalServiceTest.class); @MockBean(name = "objectMapper") private ObjectMapper objectMapper; @@ -79,14 +79,14 @@ public class ArchiveInternalServiceTest { private AgencyService agencyService; @InjectMocks - private ArchiveInternalService archiveInternalService; + private ArchiveSearchInternalService archiveSearchInternalService; public final String FILING_HOLDING_SCHEME_RESULTS = "data/vitam_filing_holding_units_response.json"; @Before public void setUp() { ServerIdentityConfigurationBuilder.setup("identityName", "identityRole", 1, 0); - archiveInternalService = new ArchiveInternalService(objectMapper, unitService, agencyService); + archiveSearchInternalService = new ArchiveSearchInternalService(objectMapper, unitService, agencyService); } @Test(expected = InvalidParseOperationException.class) @@ -105,7 +105,7 @@ public class ArchiveInternalServiceTest { when(unitService.searchUnits(any(), any())) .thenReturn(buildUnitMetadataResponse(FILING_HOLDING_SCHEME_RESULTS)); // When - JsonNode jsonNode = archiveInternalService.searchUnits(any(), any()); + JsonNode jsonNode = archiveSearchInternalService.searchUnits(any(), any()); // Configure the mapper ObjectMapper objectMapper = new ObjectMapper(); @@ -123,7 +123,7 @@ public class ArchiveInternalServiceTest { throws IOException, InvalidParseOperationException { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - InputStream inputStream = ArchiveInternalServiceTest.class.getClassLoader() + InputStream inputStream = ArchiveSearchInternalServiceTest.class.getClassLoader() .getResourceAsStream(filename); return RequestResponseOK .getFromJsonNode(objectMapper.readValue(ByteStreams.toByteArray(inputStream), JsonNode.class)); 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 79e004bb356f4bc23357d2d28ae90ffc94ff2849..47af84e5b5bc96f348cabea21961f576879f7f32 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 @@ -105,7 +105,7 @@ <div class="col-12"> <button class="btn secondary download-btn" [disabled]="archiveUnit['#object'] == null" (click)="onDownloadObjectFromUnit(archiveUnit)"> - <i class="vitamui-icon vitamui-icon-download"></i> <span>{{'ARCHIVE_SEARCH.ARCHIVE_UNIT_PREVIEW.FIELDS.DOWNLOAD_DOC' | translate}}</span> + <i class="vitamui-icon vitamui-icon-deposit"></i> <span>{{'ARCHIVE_SEARCH.ARCHIVE_UNIT_PREVIEW.FIELDS.DOWNLOAD_DOC' | translate}}</span> </button> </div> </div> diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.scss b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.scss index 3f18faecd9c093f48b407c3ac15be0f361b463db..76cc1c61b8c19ba2f73a5e798bc48ffd8ae14827 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.scss +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.scss @@ -1,13 +1,9 @@ .download-btn{ - width: 218px; - height: 50px; - background: #702382; border-radius: 100px; color: white; font-size: 14px; font-weight: bold; - letter-spacing: 0.1px; - text-decoration-line: underline; margin: 20px; -} \ No newline at end of file + margin-left: 120px; +} diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.ts index 4217c1c3f451bf4d1fcf54262b83a17fcbed05af..e099d153567d8e518b0d369e1fe4b6cd28624ec9 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-preview/archive-preview.component.ts @@ -30,7 +30,6 @@ export class ArchivePreviewComponent implements OnInit { } - ngOnInit() { } @@ -40,7 +39,7 @@ export class ArchivePreviewComponent implements OnInit { let headers = new HttpHeaders().append('Content-Type', 'application/json'); headers = headers.append('X-Access-Contract-Id', this.accessContract); - return this.archiveService.downloadObjectFromUnit(archiveUnit['#id'], headers); + return this.archiveService.downloadObjectFromUnit(archiveUnit['#id'], archiveUnit.Title, headers); } emitClose() { diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts index 2a48c2aa2f78739567ef0998b7d9dbf1b2c5563a..c61e0f3774fc1d75a5a7912bd14ce02983e4be58 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive.service.ts @@ -153,7 +153,7 @@ export class ArchiveService extends SearchService<any> { return pagedResult; } - downloadObjectFromUnit(id : string , headers?: HttpHeaders) { + downloadObjectFromUnit(id : string , name : string, headers?: HttpHeaders) { return this.archiveApiService.downloadObjectFromUnit(id, headers).subscribe( @@ -161,7 +161,7 @@ export class ArchiveService extends SearchService<any> { const element = document.createElement('a'); element.href = window.URL.createObjectURL(file); - element.download ='item-'+id; + element.download =name; element.style.visibility = 'hidden'; document.body.appendChild(element); element.click();