+
+
+
+
+
{{fileName}} ({{fileData?.sizeBytes | dsFileSize}})
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index e2f600654d..bb72439aab 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -66,7 +66,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
const fileName = '123456-test-upload.jpg';
const fileId = '123456-test-upload';
const fileData: any = mockUploadFiles[0];
- const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+ const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
add: jasmine.createSpy('add'),
@@ -200,6 +200,23 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
expect(compAsAny.deleteFile).toHaveBeenCalled();
});
+ it('should delete primary if file we delete is primary', () => {
+ compAsAny.isPrimary = true;
+ compAsAny.pathCombiner = pathCombiner;
+ operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+ compAsAny.deleteFile();
+ expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath('primary'));
+ expect(uploadService.updateFilePrimaryBitstream).toHaveBeenCalledWith(submissionId, sectionId, null);
+ });
+
+ it('should NOT delete primary if file we delete is NOT primary', () => {
+ compAsAny.isPrimary = false;
+ compAsAny.pathCombiner = pathCombiner;
+ operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+ compAsAny.deleteFile();
+ expect(uploadService.updateFilePrimaryBitstream).not.toHaveBeenCalledTimes(1);
+ });
+
it('should delete file properly', () => {
compAsAny.pathCombiner = pathCombiner;
operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
@@ -208,7 +225,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
compAsAny.deleteFile();
expect(uploadService.removeUploadedFile).toHaveBeenCalledWith(submissionId, sectionId, fileId);
- expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath());
+ expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath(['files', fileIndex]));
+
expect(operationsService.jsonPatchByResourceID).toHaveBeenCalledWith(
'workspaceitems',
submissionId,
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 26fb9445cb..f95e8213ca 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,5 +1,4 @@
import {
- ChangeDetectorRef,
Component,
Input,
OnChanges,
@@ -9,7 +8,7 @@ import {
ViewChild
} from '@angular/core';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { DynamicFormControlModel, } from '@ng-dynamic-forms/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -22,7 +21,6 @@ import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/buil
import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
import { SubmissionService } from '../../../submission.service';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -37,6 +35,12 @@ import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
templateUrl: './section-upload-file.component.html',
})
export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy {
+ /**
+ * The indicator is the primary bitstream
+ * it will be null if no primary bitstream is set for the ORIGINAL bundle
+ * @type {boolean, null}
+ */
+ @Input() isPrimary: boolean | null;
/**
* The list of available access condition
@@ -100,6 +104,11 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
*/
@ViewChild(SubmissionSectionUploadFileEditComponent) fileEditComp: SubmissionSectionUploadFileEditComponent;
+ /**
+ * A boolean representing if a submission save operation is pending
+ * @type {Observable
}
+ */
+ public processingSaveStatus$: Observable;
/**
* The bitstream's metadata data
@@ -137,6 +146,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
*/
protected pathCombiner: JsonPatchOperationPathCombiner;
+ /**
+ * The [JsonPatchOperationPathCombiner] object
+ * @type {JsonPatchOperationPathCombiner}
+ */
+ protected primaryBitstreamPathCombiner: JsonPatchOperationPathCombiner;
+
/**
* Array to track all subscriptions and unsubscribe them onDestroy
* @type {Array}
@@ -162,9 +177,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
* @param {SectionUploadService} uploadService
*/
constructor(
- private cdr: ChangeDetectorRef,
private formService: FormService,
- private halService: HALEndpointService,
private modalService: NgbModal,
private operationsBuilder: JsonPatchOperationsBuilder,
private operationsService: SubmissionJsonPatchOperationsService,
@@ -197,7 +210,8 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
*/
ngOnInit() {
this.formId = this.formService.getUniqueId(this.fileId);
- this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId, 'files', this.fileIndex);
+ this.processingSaveStatus$ = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
+ this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId);
this.loadFormMetadata();
}
@@ -247,7 +261,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
activeModal.componentInstance.formMetadata = this.formMetadata;
activeModal.componentInstance.pathCombiner = this.pathCombiner;
activeModal.componentInstance.submissionId = this.submissionId;
+ activeModal.componentInstance.isPrimary = this.isPrimary;
+ }
+ togglePrimaryBitstream(event) {
+ this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, event.target.checked, this.fileId);
+ this.submissionService.dispatchSaveSection(this.submissionId, this.sectionId);
}
ngOnDestroy(): void {
@@ -273,13 +292,20 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
* Delete bitstream from submission
*/
protected deleteFile() {
- this.operationsBuilder.remove(this.pathCombiner.getPath());
+ this.operationsBuilder.remove(this.pathCombiner.getPath(['files', this.fileIndex]));
+ if (this.isPrimary) {
+ this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
+ }
+
this.subscriptions.push(this.operationsService.jsonPatchByResourceID(
this.submissionService.getSubmissionObjectLinkName(),
this.submissionId,
this.pathCombiner.rootElement,
this.pathCombiner.subRootElement)
.subscribe(() => {
+ if (this.isPrimary) {
+ this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, null);
+ }
this.uploadService.removeUploadedFile(this.submissionId, this.sectionId, this.fileId);
this.processingDelete$.next(false);
}));
diff --git a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
index 9e0a265c3c..952813e03c 100644
--- a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
@@ -17,6 +17,13 @@ export class ThemedSubmissionSectionUploadFileComponent
*/
@Input() availableAccessConditionOptions: any[];
+ /**
+ * The indicator is the primary bitstream
+ * it will be null if no primary bitstream is set for the ORIGINAL bundle
+ * @type {boolean, null}
+ */
+ @Input() isPrimary: boolean | null;
+
/**
* The submission id
* @type {string}
@@ -69,6 +76,7 @@ export class ThemedSubmissionSectionUploadFileComponent
protected inAndOutputNames: (keyof SubmissionSectionUploadFileComponent & keyof this)[] = [
'availableAccessConditionOptions',
+ 'isPrimary',
'collectionId',
'collectionPolicyType',
'configMetadataForm',
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index b57b454288..41e912e613 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -2,15 +2,7 @@
[dismissible]="true"
[type]="AlertTypeEnum.Info">
-
-
-
-
{{'submission.sections.upload.no-file-uploaded' | translate}}
-
-
+
+ {{ 'bitstream.edit.form.primaryBitstream.label' | translate }}
+
+
@@ -45,3 +47,11 @@
+
+
+
+
+
{{'submission.sections.upload.no-file-uploaded' | translate}}
+
+