Skip to content

Bug #15605 - [Collect] Archive addition: issues with ZIP hierarchy and the Operations Log banner. #3465

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

Merged
Salimdev merged 1 commit into from
Jan 13, 2026
Merged

Bug #15605 - [Collect] Archive addition: issues with ZIP hierarchy and the Operations Log banner. #3465

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
4 changes: 2 additions & 2 deletions ...rojects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
<mat-dialog-content>
<div class="main-content">
<div class="form-group">
@if (projectUnits && importType === ImportType.DIRECTORIES_FILES) {
@if (projectUnits && (importType === ImportType.DIRECTORIES_FILES || importType === ImportType.COMPRESSED)) {
<vitamui-library-filing-plan [mode]="FilingPlanMode.SOLO" [formControl]="linkParentIdControl" [dataSource]="projectUnits">
</vitamui-library-filing-plan>
} @else if (importType === ImportType.COMPRESSED || importType === ImportType.SIP) {
} @else if (importType === ImportType.SIP) {
<span class="text meduim">
{{ 'COLLECT.MODAL.ARCHIVE_POSITION_MSG_FOR_SIP' | translate }}
</span>
Expand Down
52 changes: 31 additions & 21 deletions .../projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ import {
ZipFileStatus,
ApplicationId,
SnackBarService,
StartupService,
} from 'vitamui-library';
import { ArchiveCollectService } from '../archive-collect.service';
import { FormControl, Validators } from '@angular/forms';
import { last, tap } from 'rxjs/operators';
import { HttpEventType } from '@angular/common/http';
import { ActivatedRoute } from '@angular/router';

export enum ImportType {
DIRECTORIES_FILES = 'DIRECTORIES_FILES',
Expand All @@ -75,7 +75,6 @@ export class AddUnitsComponent implements OnInit {
protected readonly FilingPlanMode = FilingPlanMode;
protected readonly uploadMaxSizeInBytes = Math.pow(1024, 3); // 1 Gb

uploadedOperationId: string;
isLoading = false;
stepIndex = 0;

Expand All @@ -93,7 +92,7 @@ export class AddUnitsComponent implements OnInit {
public data: {
transaction: Transaction;
},
private route: ActivatedRoute,
private startupService: StartupService,
private snackBarService: SnackBarService,
private dialog: MatDialog,
private addUnitsDialogRef: MatDialogRef<AddUnitsComponent>,
Expand Down Expand Up @@ -141,9 +140,6 @@ export class AddUnitsComponent implements OnInit {
}

close(filesUploaded: boolean) {
if (filesUploaded && this.importType === ImportType.SIP && this.uploadedOperationId) {
this.handleUploadSIPSuccess(this.uploadedOperationId);
}
this.confirmCancelDialog?.close(true);
this.addUnitsDialogRef.close(filesUploaded);
}
Expand Down Expand Up @@ -176,8 +172,13 @@ export class AddUnitsComponent implements OnInit {
tap((httpEvent) => zipFile.updateUploadingZipFileStatus(httpEvent)),
last((httpEvent) => httpEvent.type === HttpEventType.Response),
tap((httpEvent) => {
if (this.importType === ImportType.SIP && httpEvent.type === HttpEventType.Response) {
this.uploadedOperationId = httpEvent.body;
if (httpEvent.type === HttpEventType.Response) {
if (this.importType === ImportType.SIP) {
this.handleUploadSuccess(httpEvent.body);
} else {
// For ZIP and DIRECTORIES_FILES, show success banner without operation ID
this.handleUploadSuccess(null);
}
}
}),
finalize(() => (this.isLoading = false)),
Expand All @@ -193,19 +194,28 @@ export class AddUnitsComponent implements OnInit {
this.filesToUploadControl.setValue([]);
}

private handleUploadSIPSuccess(operationId: string): void {
const tenantId = this.route.snapshot.params.tenantIdentifier;
this.snackBarService.open({
message: 'COLLECT.MODAL.IMPORT_SIP_ARCHIVES_PACKAGE_WITH_SUCCESS',
buttons: [
{
appId: ApplicationId.LOGBOOK_OPERATION_APP,
path: `/tenant/${tenantId}?guid=${operationId}`,
label: 'SNACK_BAR.TO_OPERATION_APP',
},
],
duration: 100_000,
});
private handleUploadSuccess(operationId: string | null): void {
if (operationId) {
// For SIP imports with operation ID
const tenantId = this.startupService.getTenantIdentifier();
this.snackBarService.open({
message: 'COLLECT.MODAL.IMPORT_SIP_ARCHIVES_PACKAGE_WITH_SUCCESS',
buttons: [
{
appId: ApplicationId.LOGBOOK_OPERATION_APP,
path: `/tenant/${tenantId}?guid=${operationId}`,
label: 'SNACK_BAR.TO_OPERATION_APP',
},
],
duration: 100_000,
});
} else {
// For ZIP and DIRECTORIES_FILES imports without operation ID
this.snackBarService.open({
message: 'COLLECT.UPLOAD.TERMINATED',
duration: 10_000,
});
}
}

get importType(): string | null {
Expand Down
Loading