Skip to content

WIP : Use new upload component #3539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
marob wants to merge 1 commit into
base: develop
Choose a base branch
from
+173 −764
Draft

WIP : Use new upload component #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...d/projects/archive-search/src/app/archive/archive-search/archive-search.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,10 @@ describe('ArchiveSearchComponent', () => {
expect(archiveServiceStub.hasArchiveSearchRole).toHaveBeenCalled();
});
it('should open a modal with TransferAcknowledgmentComponent', () => {
component.accessContractId = 'accessContract';
component.showAcknowledgmentTransferForm();
expect(matDialogSpy.open).toHaveBeenCalledWith(TransferAcknowledgmentComponent, {
disableClose: true,
data: {
accessContract: 'accessContract',
tenantIdentifier: '1',
},
});
Expand Down
1 change: 0 additions & 1 deletion ...ontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,6 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy, Aft
const dialogRef = this.dialog.open(TransferAcknowledgmentComponent, {
disableClose: true,
data: {
accessContract: this.accessContractId,
tenantIdentifier: this.tenantIdentifier.toString(),
},
});
Expand Down
159 changes: 52 additions & 107 deletions ...app/archive/archive-search/transfer-acknowledgment/transfer-acknowledgment.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@
[title]="'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.TITLE_FIRST_STEP' | translate"
></vitamui-dialog-header>

<vitamui-stepper #stepper [selectedIndex]="stepIndex" (selectionChange)="stepIndex = $event.selectedIndex">
<vitamui-stepper #stepper>
<!-- Step 1 -->
<cdk-step>
<mat-dialog-content>
<div>
<h4>
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.DOWNLOAD_ATR_FILE' | translate }}
<i
class="vitamui-icon vitamui-icon-info"
[vitamuiTooltip]="'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.DOWNLOAD_ATR_FILE_TEXT' | translate"
></i>
</h4>
<div class="text large bold my-2">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.DOWNLOAD_ATR_FILE' | translate }}
<i
class="vitamui-icon vitamui-icon-info"
[vitamuiTooltip]="'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.DOWNLOAD_ATR_FILE_TEXT' | translate"
></i>
</div>

<div *ngIf="isLoadingData; then loadingMode; else dragAndDropArea"></div>
<vitamui-file-selector
[formControl]="atrControl"
[maxSizeInBytes]="FILE_MAX_SIZE"
[extensions]="[ATR_EXTENSION]"
[fileValidators]="atrContentValidator"
[errorMessageMap]="{
fileBadFormat: 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.FILE_BAD_FORMAT',
atrNotValid: 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ATR_NOT_VALID',
}"
/>
</mat-dialog-content>

<mat-dialog-actions>
<button
(click)="validateAndParseXmlFile()"
[disabled]="isDisabled || hasError || hasFileSizeError || isAtrNotValid || isLoadingData"
class="btn primary"
type="button"
>
{{ 'COMMON.NEXT' | translate }}
</button>
<button (click)="onClose()" class="btn cancel link" type="button" [disabled]="isLoadingData">
<vitamui-next-step [disabled]="atrControl.invalid || atrControl.pending" />
<button (click)="onClose()" class="btn cancel link" type="button">
{{ 'COMMON.UNDO' | translate }}
</button>
</mat-dialog-actions>
Expand All @@ -39,40 +39,40 @@ <h4>
<cdk-step>
<mat-dialog-content>
<div>
<p class="detail-text">
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.OPERATION_MESSAGE_IDENTIFIER' | translate }}
</p>
<p>{{ transfertDetails.messageRequestIdentifier }}</p>
</div>

<div>
<p class="detail-text">
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.TRANSFER_REALISATION_DATE' | translate }}
</p>
<p>{{ transfertDetails.date | dateTime: 'dd/MM/yyyy' }}</p>
</div>

<div>
<p class="detail-text">{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ENTRY_CONTRACT' | translate }}</p>
<p class="text normal bold primary">{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ENTRY_CONTRACT' | translate }}</p>
<p>{{ transfertDetails.archivalAgreement }}</p>
</div>

<div>
<p class="detail-text">
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ARCHIVAL_AGENCY_IDENTIFIER' | translate }}
</p>
<p>{{ transfertDetails.archivalAgency }}</p>
</div>

<div>
<p class="detail-text">
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.TRANSFERRING_AGENCY_IDENTIFIER' | translate }}
</p>
<p>{{ transfertDetails.transferringAgency }}</p>
</div>

<div>
<p class="detail-text">
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.TRANSFER_ACKNOWLEDGMENT_STATUS' | translate }}
</p>
<p>{{ transfertDetails.archiveTransferReply }}</p>
Expand All @@ -81,9 +81,7 @@ <h4>

<mat-dialog-actions>
<div>
<button (click)="goToNextStep()" class="btn primary" type="button">
{{ 'COMMON.NEXT' | translate }}
</button>
<vitamui-next-step />
<button (click)="onCancel()" class="btn cancel link" type="button">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CANCEL_ACTION' | translate }}
</button>
Expand All @@ -95,7 +93,32 @@ <h4>
<!-- Step 3 -->
<cdk-step>
<mat-dialog-content>
<div *ngIf="isSubmitBtnDisabled; then loadingMode; else transferReplyStatusDetails"></div>
@if (isSubmitBtnDisabled) {
<div class="vitamui-min-content">
<mat-spinner class="vitamui-spinner large"></mat-spinner>
</div>
} @else {
<div>
<p class="text normal bold primary">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ACKNOWLEDGMENT_TRANSFER_CONTROL' | translate }}
</p>
<p class="text medium bold">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ACKNOWLEDGMENT_TRANSFER_REPLY_CODE' | translate }}
{{ transfertDetails.archiveTransferReply }}
</p>
<p class="text medium bold">
@if (transfertDetails.archiveTransferReply === 'OK') {
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_SUCCESS_TRANSFER' | translate }}
}
@if (transfertDetails.archiveTransferReply === 'WARNING') {
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_SUCCESS_TRANSFER' | translate }}
}
@if (transfertDetails.archiveTransferReply === 'KO') {
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_FAILURE_TRANSFER' | translate }}
}
</p>
</div>
}
</mat-dialog-content>

<mat-dialog-actions>
Expand Down Expand Up @@ -129,81 +152,3 @@ <h4>
</button>
</mat-dialog-actions>
</ng-template>

<ng-template #loadingMode>
<div class="vitamui-min-content">
<mat-spinner class="vitamui-spinner large"></mat-spinner>
</div>
</ng-template>

<ng-template #transferReplyStatusDetails>
<div>
<p class="detail-text">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ACKNOWLEDGMENT_TRANSFER_CONTROL' | translate }}
</p>
<p class="text-size">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ACKNOWLEDGMENT_TRANSFER_REPLY_CODE' | translate }}
{{ transfertDetails.archiveTransferReply }}
</p>
<p class="text-size" [ngSwitch]="transfertDetailsCode">
<ng-container *ngSwitchCase="'OK'"> {{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_SUCCESS_TRANSFER' | translate }}</ng-container>
<ng-container *ngSwitchCase="'WARNING'">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_SUCCESS_TRANSFER' | translate }}
</ng-container>
<ng-container *ngSwitchCase="'KO'">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.CONFIRM_FAILURE_TRANSFER' | translate }}
</ng-container>
</p>
</div>
</ng-template>

<ng-template #dragAndDropArea>
<div class="d-flex">
<div class="drag-and-drop-area" vitamuiCommonDragAndDrop (fileToUploadEmitter)="handleFile($event)">
<div *ngIf="fileName && fileSize > 0 && fileSizeString" class="drag-container">
<div class="file-info-class">
{{ fileName }}
<span class="text light"> | {{ fileSizeString }} </span>
<i class="material-icons success-icon" *ngIf="!hasError">check_circle</i>
<div>
<span class="text danger bold">{{ message }} </span>
<i class="material-icons error-icon" *ngIf="hasError">cancel </i>
</div>

<div *ngIf="hasFileSizeError">
<div>
<span class="text danger bold"> {{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.AUTHORIZED_SIZE' | translate }}</span>
<i class="material-icons error-icon">cancel </i>
</div>
</div>

<div *ngIf="isAtrNotValid">
<div>
<span class="text danger bold"> {{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ATR_NOT_VALID' | translate }}</span>
<i class="material-icons error-icon">cancel </i>
</div>
</div>
</div>
</div>

<input type="file" #atrXmlFile class="input-file" (change)="handleFile($event.target.files)" />

<div class="drop-area">
<div class="atr-drop">{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.DRAG_AND_DROP' | translate }}<br /></div>

<div class="atr-drop">
<div class="upload">
<span class="url-select" (click)="addTransferAtrFile()">
{{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.BROWSE' | translate }}</span
>
</div>
</div>
<div class="atr-drop-small">
<span> {{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.ACCEPTED_FORMAT' | translate }}</span
><br /><br />
<span> {{ 'ARCHIVE_SEARCH.TRANSFER_ACKNOWLEDGMENT.MAX_SIZE' | translate }}</span>
</div>
</div>
</div>
</div>
</ng-template>
149 changes: 0 additions & 149 deletions ...app/archive/archive-search/transfer-acknowledgment/transfer-acknowledgment.component.scss
View file
Open in desktop

This file was deleted.

Loading
Loading