Merge pull request #1982 from ProgrammeVitam/story_#12885_export_tree…

…_of_directories_and_files story #12885: export dip with tree
ProgrammeVitam · Aug 6, 2024 · 8c8616e · 8c8616e
2 parents 682a537 + 38268e1
commit 8c8616e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 0 deletions.
diff --git a/...ommons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java b/...ommons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java
@@ -61,5 +61,6 @@ public class ExportDipCriteriaDto implements Serializable {
     private Map<DataObjectVersionType, Set<QualifierVersion>> dataObjectVersionsPatterns;
     private boolean lifeCycleLogs;
     private boolean withoutObjects;
+    private boolean exportWithTree;
     private String sedaVersion;
 }
diff --git a/...c/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java b/...c/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java
@@ -81,6 +81,7 @@ private DipRequest prepareDipRequestBody(final ExportDipCriteriaDto exportDipCri
             dipRequest.setDataObjectVersionToExport(dataObjectVersionToExport);
             dipRequest.setDipRequestParameters(exportDipCriteriaDto.getDipRequestParameters());
             dipRequest.setSedaVersion(exportDipCriteriaDto.getSedaVersion());
+            dipRequest.setExportWithTree(exportDipCriteriaDto.isExportWithTree());
         }
         return dipRequest;
     }

diff --git a/...ive-search/additional-actions-search/dip-request-create/dip-request-create.component.html b/...ive-search/additional-actions-search/dip-request-create/dip-request-create.component.html
@@ -123,6 +123,15 @@
               </mat-button-toggle-group>
             </div>
 
+            <div class="gap-10">
+              <div class="text-text-medium-bold primary">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
+              <div class="col-6">
+                <vitamui-common-slide-toggle formControlName="exportWithTree">
+                  {{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT_MESSAGE' | translate }}</vitamui-common-slide-toggle
+                >
+              </div>
+            </div>
+
             <div class="gap-30">
               <div class="gap-10">
                 <div class="text-text-medium-bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>

diff --git a/...chive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts b/...chive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts
@@ -109,6 +109,7 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy {
       this.fb.group({
         includeLifeCycleLogs: [false],
         sedaVersion: ['2.2'],
+        exportWithTree: false,
         includeObjects: [UsageVersionEnum.ALL],
         usages: this.fb.array([
           this.fb.group({
@@ -188,6 +189,7 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy {
       lifeCycleLogs: step2Values.includeLifeCycleLogs,
       withoutObjects: step2Values.includeObjects === UsageVersionEnum.NONE,
       sedaVersion: step2Values.sedaVersion,
+      exportWithTree: step2Values.exportWithTree,
     };
 
     this.archiveService.exportDIPService(exportDIPRequestDto).subscribe(

diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts
@@ -36,6 +36,7 @@ export interface ExportDIPRequestDto {
   dataObjectVersionsPatterns: { [key in ObjectQualifierTypeType]: QualifierVersion[] };
   lifeCycleLogs: boolean;
   withoutObjects: boolean;
+  exportWithTree: boolean;
   sedaVersion: DIPSedaVersion;
 }
 

diff --git a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json
@@ -3427,6 +3427,8 @@
       "LOGS": "Lifecycle logs presence",
       "SEDA_VERSION": "SEDA version to apply",
       "INCLUDE_OBJECTS": "Objects presence",
+      "EXPORT_FORMAT": "Export format",
+      "EXPORT_FORMAT_MESSAGE": "Format the DIP for use on an office workstation",
       "TARGET_USAGE_#": "Target usage #{{i}}",
       "INCLUDE": "Include",
       "EXCLUDE": "Exclude",

diff --git a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json
@@ -4881,6 +4881,8 @@
       "LOGS": "Présence des journaux de cycle de vie",
       "SEDA_VERSION": "Version du SEDA à appliquer",
       "INCLUDE_OBJECTS": "Présence des objets",
+      "EXPORT_FORMAT": "Format de l'export",
+      "EXPORT_FORMAT_MESSAGE": "Formater le DIP pour une exploitation sur un poste bureautique",
       "TARGET_USAGE_#": "Usage cible {{i}}",
       "INCLUDE": "Inclure",
       "EXCLUDE": "Exclure",