From a55eb97a6ac5bd4ee4a32d07b09369d5d2fa286a Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Fri, 20 Oct 2023 16:04:40 +0200
Subject: [PATCH 01/20] [CST-12043] fix: normalization for boolean

---
 src/app/shared/form/builder/form-builder.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index cf6f38bf7b8..8bd449a07d1 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -196,6 +196,7 @@ export class FormBuilderService extends DynamicFormService {
           return new FormFieldMetadataValueObject((controlValue as any).value, controlLanguage, authority, (controlValue as any).display, place, (controlValue as any).confidence);
         }
       }
+      return controlValue;
     };
 
     const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): void => {

From ffdeca69f45ff4b0ce811f237a314fc672816777 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Fri, 20 Oct 2023 16:07:31 +0200
Subject: [PATCH 02/20] [CST-12043] feature: add primary bitstream switch

---
 .../workspaceitem-section-upload.model.ts     |  5 +-
 .../custom-switch.component.html              |  2 +-
 .../objects/submission-objects.actions.ts     | 25 +++++
 .../objects/submission-objects.reducer.ts     | 47 ++++++++-
 .../section-upload-file-edit.component.html   |  6 +-
 .../section-upload-file-edit.component.ts     | 69 +++++++------
 .../edit/section-upload-file-edit.model.ts    | 13 +++
 .../file/section-upload-file.component.html   |  9 +-
 .../file/section-upload-file.component.ts     | 97 ++++++++++++++++++-
 .../themed-section-upload-file.component.ts   |  8 ++
 .../upload/section-upload.component.html      | 28 +++---
 .../upload/section-upload.component.ts        | 35 +++----
 .../sections/upload/section-upload.service.ts | 36 ++++++-
 13 files changed, 303 insertions(+), 77 deletions(-)

diff --git a/src/app/core/submission/models/workspaceitem-section-upload.model.ts b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
index f98e0584ebc..d992567df4c 100644
--- a/src/app/core/submission/models/workspaceitem-section-upload.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
@@ -4,7 +4,10 @@ import { WorkspaceitemSectionUploadFileObject } from './workspaceitem-section-up
  * An interface to represent submission's upload section data.
  */
 export interface WorkspaceitemSectionUploadObject {
-
+  /**
+   * Primary bitstream flag
+   */
+  primary: string | null;
   /**
    * A list of [[WorkspaceitemSectionUploadFileObject]]
    */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index ed117a50219..572c99ad3a7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -13,7 +13,7 @@
          (blur)="onBlur($event)"
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
-  <label class="form-check-label custom-control-label" [for]="bindId && model.id">
+  <label class="form-check-label custom-control-label"  [for]="bindId && model.id">
     <span [innerHTML]="model.label"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 9182611e479..2f1ecf7fa85 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -59,6 +59,7 @@ export const SubmissionObjectActionTypes = {
   // Upload file types
   NEW_FILE: type('dspace/submission/NEW_FILE'),
   EDIT_FILE_DATA: type('dspace/submission/EDIT_FILE_DATA'),
+  EDIT_FILE_PRIMARY_BITSTREAM_DATA: type('dspace/submission/EDIT_FILE_PRIMARY_BITSTREAM_DATA'),
   DELETE_FILE: type('dspace/submission/DELETE_FILE'),
 
   // Errors
@@ -760,6 +761,29 @@ export class NewUploadedFileAction implements Action {
   }
 }
 
+export class EditFilePrimaryBitstreamAction implements Action {
+  type = SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA;
+  payload: {
+    submissionId: string;
+    sectionId: string;
+    fileId: string;
+  };
+
+  /**
+   * Edit a file data
+   *
+   * @param submissionId
+   *    the submission's ID
+   * @param sectionId
+   *    the section's ID
+   * @param fileId
+   *    the file's ID
+   */
+  constructor(submissionId: string, sectionId: string, fileId: string) {
+    this.payload = { submissionId, sectionId, fileId: fileId };
+  }
+}
+
 export class EditFileDataAction implements Action {
   type = SubmissionObjectActionTypes.EDIT_FILE_DATA;
   payload: {
@@ -833,6 +857,7 @@ export type SubmissionObjectAction = DisableSectionAction
   | SectionStatusChangeAction
   | NewUploadedFileAction
   | EditFileDataAction
+  | EditFilePrimaryBitstreamAction
   | DeleteUploadedFileAction
   | InertSectionErrorsAction
   | DeleteSectionErrorsAction
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index a05bf05f52c..4970e25d325 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,4 +1,4 @@
-import { hasValue, isEmpty, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty, isNotNull, isNull, isUndefined } from '../../shared/empty.util';
 import differenceWith from 'lodash/differenceWith';
 import findKey from 'lodash/findKey';
 import isEqual from 'lodash/isEqual';
@@ -14,6 +14,7 @@ import {
   DepositSubmissionSuccessAction,
   DisableSectionAction,
   EditFileDataAction,
+  EditFilePrimaryBitstreamAction,
   EnableSectionAction,
   InertSectionErrorsAction,
   InitSectionAction,
@@ -203,6 +204,10 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return newFile(state, action as NewUploadedFileAction);
     }
 
+    case SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA: {
+      return editPrimaryBitstream(state, action as EditFilePrimaryBitstreamAction);
+    }
+
     case SubmissionObjectActionTypes.EDIT_FILE_DATA: {
       return editFileData(state, action as EditFileDataAction);
     }
@@ -735,6 +740,46 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
   });
 }
 
+/**
+ * Edit primary bitstream.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an EditFilePrimaryBitstreamAction action
+ * @return SubmissionObjectState
+ *    the new state, with the edited file.
+ */
+function editPrimaryBitstream(state: SubmissionObjectState, action: EditFilePrimaryBitstreamAction): SubmissionObjectState {
+  const filesData = state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data as WorkspaceitemSectionUploadObject;
+  const { submissionId, sectionId, fileId } = action.payload;
+
+  const fileIndex = findKey(filesData.files, { uuid: fileId });
+  if (isNull(fileIndex)) {
+    return state;
+  }
+
+  const submission = state[submissionId];
+  return {
+    ...state,
+    [submissionId]: {
+      ...submission,
+      sections: {
+        ...submission.sections,
+        [sectionId]: {
+          ...submission.sections[sectionId],
+          data: {
+            ...submission.sections[sectionId].data as WorkspaceitemSectionUploadObject,
+            primary: fileId
+          }
+        }
+      },
+      isLoading: submission.isLoading,
+      savePending: submission.savePending,
+    }
+  };
+}
+
 /**
  * Edit a file.
  *
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 2baa6c1555a..c5c737e4e13 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,9 +1,9 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
-      <span aria-hidden="true">×</span>
-    </button>
+      <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
+        <span aria-hidden="true">×</span>
+      </button>
   </div>
   <div class="modal-body">
 
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 9ee4a7dda5e..648271b7b78 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -28,6 +28,8 @@ import {
   BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
+  BITSTREAM_FORM_PRIMARY,
+  BITSTREAM_FORM_PRIMARY_LAYOUT,
   BITSTREAM_METADATA_FORM_GROUP_CONFIG,
   BITSTREAM_METADATA_FORM_GROUP_LAYOUT
 } from './section-upload-file-edit.model';
@@ -40,12 +42,10 @@ import { SubmissionService } from '../../../../submission.service';
 import { FormService } from '../../../../../shared/form/form.service';
 import { FormComponent } from '../../../../../shared/form/form.component';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, mergeMap, take } from 'rxjs/operators';
+import { filter, mergeMap, take, tap } from 'rxjs/operators';
 import { dateToISOFormat } from '../../../../../shared/date.util';
-import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import {
-  WorkspaceitemSectionUploadObject
-} from '../../../../../core/submission/models/workspaceitem-section-upload.model';
+
+
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
 import {
   SubmissionJsonPatchOperationsService
@@ -54,9 +54,10 @@ import {
   JsonPatchOperationPathCombiner
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SectionUploadService } from '../../section-upload.service';
-import { Subscription } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
 import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
 import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 
 /**
  * This component represents the edit form for bitstream
@@ -74,6 +75,13 @@ export class SubmissionSectionUploadFileEditComponent
    */
   @ViewChild('formRef') public formRef: FormComponent;
 
+  /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+  isPrimary: boolean;
+
   /**
    * The list of available access condition
    * @type {Array}
@@ -160,6 +168,12 @@ export class SubmissionSectionUploadFileEditComponent
 
   protected subscriptions: Subscription[] = [];
 
+  private onSaveBitstreamData$: Subject<any> = new Subject();
+
+  get saveBitstreamDataEvent$(): Observable<void> {
+    return this.onSaveBitstreamData$.asObservable();
+  }
+
   /**
    * Initialize instance variables
    *
@@ -191,6 +205,10 @@ export class SubmissionSectionUploadFileEditComponent
    *    The form model
    */
   public initModelData(formModel: DynamicFormControlModel[]) {
+
+    const primaryBitstreammodel: any = this.formBuilderService.findById('primaryBitstream', formModel, this.fileIndex);
+    primaryBitstreammodel.value = this.isPrimary || false;
+
     this.fileData.accessConditions.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
         .filter((key) => accessCondition.hasOwnProperty(key) && isNotEmpty(accessCondition[key]))
@@ -291,6 +309,9 @@ export class SubmissionSectionUploadFileEditComponent
       ])
     });
     const formModel: DynamicFormControlModel[] = [];
+
+    formModel.push(new DynamicCustomSwitchModel(BITSTREAM_FORM_PRIMARY, BITSTREAM_METADATA_FORM_GROUP_LAYOUT));
+
     const metadataGroupModelConfig = Object.assign({}, BITSTREAM_METADATA_FORM_GROUP_CONFIG);
     metadataGroupModelConfig.group = this.formBuilderService.modelFromConfiguration(
       this.submissionId,
@@ -386,25 +407,29 @@ export class SubmissionSectionUploadFileEditComponent
     return formModel;
   }
 
+
   /**
    * Save bitstream metadata
    */
   saveBitstreamData() {
+
+    const pathFragment = ['files', this.fileIndex];
+
     // validate form
     this.formService.validateAllFormFields(this.formRef.formGroup);
-    const saveBitstreamDataSubscription = this.formService.isValid(this.formId).pipe(
+    const subscription = this.formService.isValid(this.formId).pipe(
       take(1),
       filter((isValid) => isValid),
       mergeMap(() => this.formService.getFormData(this.formId)),
       take(1),
-      mergeMap((formData: any) => {
+      tap((formData: any) => {
         // collect bitstream metadata
         Object.keys((formData.metadata))
           .filter((key) => isNotEmpty(formData.metadata[key]))
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.add(this.pathCombiner.getPath(path), formData.metadata[key], true);
+            this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, path]), formData.metadata[key], true);
           });
         Object.keys((this.fileData.metadata))
           .filter((key) => isNotEmpty(this.fileData.metadata[key]))
@@ -413,7 +438,7 @@ export class SubmissionSectionUploadFileEditComponent
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.remove(this.pathCombiner.getPath(path));
+            this.operationsBuilder.remove(this.pathCombiner.getPath([...pathFragment, path]));
           });
         const accessConditionsToSave = [];
         formData.accessConditions
@@ -467,29 +492,11 @@ export class SubmissionSectionUploadFileEditComponent
           });
 
         if (isNotEmpty(accessConditionsToSave)) {
-          this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true);
+          this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, 'accessConditions']), accessConditionsToSave, true);
         }
-
-        // dispatch a PATCH request to save metadata
-        return this.operationsService.jsonPatchByResourceID(
-          this.submissionService.getSubmissionObjectLinkName(),
-          this.submissionId,
-          this.pathCombiner.rootElement,
-          this.pathCombiner.subRootElement);
       })
-    ).subscribe((result: SubmissionObject[]) => {
-      if (result[0].sections[this.sectionId]) {
-        const uploadSection = (result[0].sections[this.sectionId] as WorkspaceitemSectionUploadObject);
-        Object.keys(uploadSection.files)
-          .filter((key) => uploadSection.files[key].uuid === this.fileId)
-          .forEach((key) => this.uploadService.updateFileData(
-            this.submissionId, this.sectionId, this.fileId, uploadSection.files[key])
-          );
-      }
-      this.isSaving = false;
-      this.activeModal.close();
-    });
-    this.subscriptions.push(saveBitstreamDataSubscription);
+    ).subscribe((formData) => this.onSaveBitstreamData$.next(formData));
+    this.subscriptions.push(subscription);
   }
 
   private unsubscribeAll() {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 7bd48559bfc..8d021732819 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -4,6 +4,7 @@ import {
   DynamicFormControlLayout,
   DynamicFormGroupModelConfig,
   DynamicSelectModelConfig,
+  DynamicSwitchModelConfig,
   MATCH_ENABLED,
   OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
@@ -56,6 +57,18 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayo
     label: 'col-form-label name-label'
   }
 };
+export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
+  grid: {
+    host: 'col-6'
+  }
+};
+
+export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
+  id: 'primaryBitstream',
+  name: 'primaryBitstream',
+  label: 'Primary bitstream',
+};
+
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
   id: 'startDate',
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index cd0ee512fde..d4acd10e772 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,6 +1,13 @@
 <ng-container *ngIf="fileData">
   <div class="row">
-    <div class="col-md-12">
+    <!-- Default switch -->
+    <div class="col-md-2 d-flex justify-content-center align-items-center" >
+      <div class="custom-control custom-switch">
+        <input type="checkbox" class="custom-control-input" id="primaryBitstream{{fileIndex}}" [(ngModel)]="isPrimary" (change)="togglePrimaryBitstream()">
+        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}"></label>
+      </div>
+    </div>
+    <div class="col-md-10">
       <div class="float-left w-75">
         <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
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 26fb9445cba..2e268ed3a36 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
@@ -10,7 +10,7 @@ import {
 } from '@angular/core';
 
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter, switchMap, tap } from 'rxjs/operators';
 import { DynamicFormControlModel, } from '@ng-dynamic-forms/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -27,6 +27,9 @@ import { SubmissionJsonPatchOperationsService } from '../../../../core/submissio
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
+import { SubmissionObject } from 'src/app/core/submission/models/submission-object.model';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -37,6 +40,19 @@ 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() set isPrimaryBitstream(status: boolean | null) {
+    this.initialPrimaryStatus = status;
+    this.isPrimary = status;
+  }
+
+
+  private initialPrimaryStatus = false;
+  isPrimary = false;
 
   /**
    * The list of available access condition
@@ -137,6 +153,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}
@@ -165,6 +187,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     private cdr: ChangeDetectorRef,
     private formService: FormService,
     private halService: HALEndpointService,
+    private notificationsService: NotificationsService,
     private modalService: NgbModal,
     private operationsBuilder: JsonPatchOperationsBuilder,
     private operationsService: SubmissionJsonPatchOperationsService,
@@ -197,7 +220,7 @@ 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.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId);
     this.loadFormMetadata();
   }
 
@@ -226,6 +249,23 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     });
   }
 
+  private updatePrimaryBitstream(primaryBitstream: boolean): void {
+    const path = this.pathCombiner.getPath('primary');
+
+    if (this.isPrimary === null && primaryBitstream) {
+      this.operationsBuilder.add(path, this.fileId, false, true);
+      return;
+    }
+
+    if (this.isPrimary !== primaryBitstream) {
+      if (primaryBitstream) {
+        this.operationsBuilder.replace(path, this.fileId, true);
+        return;
+      }
+      this.operationsBuilder.remove(path);
+    }
+  }
+
   editBitstreamData() {
 
     const options: NgbModalOptions = {
@@ -247,7 +287,52 @@ 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;
+
+    activeModal.componentInstance.saveBitstreamDataEvent$.pipe(
+    // TODO: uncoment
+    tap((data: any) => {
+      this.updatePrimaryBitstream(data.primaryBitstream[0]);
+    }),
+      switchMap(() => this.patchFileOperations())
+    ).subscribe((result: SubmissionObject[]) => {
+      this.uploadFileData(result);
+      activeModal.componentInstance.isSaving = false;
+      activeModal.close();
+    });
+  }
 
+  private uploadFileData(result: SubmissionObject[]) {
+    const section = result[0].sections[this.sectionId];
+    if (!section) {
+      return;
+    }
+    let uploadSection = (section as WorkspaceitemSectionUploadObject);
+    uploadSection = {...uploadSection, primary: this.fileId};
+
+    // TODO: update only if primary bitstream changed
+    // TODO: if the result contains primary id of this file of null then update
+    this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, this.fileId);
+
+    Object.keys(uploadSection.files)
+      .filter((key) => uploadSection.files[key].uuid === this.fileId)
+      .forEach((key) => {
+        this.uploadService.updateFileData(
+        this.submissionId, this.sectionId, this.fileId, uploadSection.files[key]);
+    });
+  }
+
+  private patchFileOperations() {
+    return this.operationsService.jsonPatchByResourceID(
+      this.submissionService.getSubmissionObjectLinkName(),
+      this.submissionId,
+      this.pathCombiner.rootElement,
+      this.pathCombiner.subRootElement);
+  }
+
+  togglePrimaryBitstream() {
+    this.updatePrimaryBitstream(!this.isPrimary);
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionId);
   }
 
   ngOnDestroy(): void {
@@ -273,7 +358,13 @@ 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) {
+      // TODO: uncoment
+      // this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
+    }
+
     this.subscriptions.push(this.operationsService.jsonPatchByResourceID(
       this.submissionService.getSubmissionObjectLinkName(),
       this.submissionId,
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 9e0a265c3ce..3bc334673e3 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 b57b4542885..5b245d37c2d 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"></ds-alert>
 
-<ng-container *ngIf="fileList.length == 0">
-  <div class="row">
-    <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
-    </div>
-  </div>
-</ng-container>
-
-<ng-container *ngIf="fileList.length > 0">
+<ng-container *ngIf="fileList.length > 0; else noFileUploaded">
 
   <div *ngIf="collectionDefaultAccessConditions.length > 0" class="row">
     <div class="col-sm-12" >
@@ -26,16 +18,16 @@ <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.n
       </ds-alert>
     </div>
   </div>
-
-  <ng-container *ngFor="let fileEntry of fileList">
+  <ng-container *ngFor="let fileEntry of fileList; let i = index;">
     <ds-themed-submission-upload-section-file
+                                       [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
                                        [availableAccessConditionOptions]="availableAccessConditionOptions"
                                        [collectionId]="collectionId"
                                        [collectionPolicyType]="collectionPolicyType"
                                        [configMetadataForm]="(configMetadataForm$ | async)"
-                                       [fileId]="fileIndexes[fileList.indexOf(fileEntry)]"
-                                       [fileIndex]="fileList.indexOf(fileEntry)"
-                                       [fileName]="fileNames[fileList.indexOf(fileEntry)]"
+                                       [fileId]="fileEntry.uuid"
+                                       [fileIndex]="i"
+                                       [fileName]="fileNames[i]"
                                        [sectionId]="sectionData.id"
                                        [submissionId]="submissionId"></ds-themed-submission-upload-section-file>
     <div class="row">
@@ -45,3 +37,11 @@ <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.n
     </div>
   </ng-container>
 </ng-container>
+
+<ng-template #noFileUploaded>
+  <div class="row">
+    <div class="col-md-12">
+      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 10203adbc0d..9281cdfb349 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -4,7 +4,8 @@ import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
-  Subscription
+  Subscription,
+  combineLatest
 } from 'rxjs';
 import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
@@ -31,6 +32,7 @@ import { AccessConditionOption } from '../../../core/config/models/config-access
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
@@ -58,10 +60,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
   public AlertTypeEnum = AlertType;
 
   /**
-   * The array containing the keys of file list array
+   * The uuid of primary bitstream file
    * @type {Array}
    */
-  public fileIndexes: string[] = [];
+  public primaryBitstreamUUID: string | null = null;
 
   /**
    * The file list
@@ -194,27 +196,18 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
         this.changeDetectorRef.detectChanges();
       }),
 
+
       // retrieve submission's bitstreams from state
-      observableCombineLatest(this.configMetadataForm$,
-        this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe(
-        filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-          return isNotEmpty(configMetadataForm) && isNotUndefined(fileList);
+      combineLatest([this.configMetadataForm$,
+        this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id)]).pipe(
+        filter(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+          return isNotEmpty(configMetadataForm) && isNotEmpty(files);
         }),
         distinctUntilChanged())
-        .subscribe(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-            this.fileList = [];
-            this.fileIndexes = [];
-            this.fileNames = [];
-            this.changeDetectorRef.detectChanges();
-            if (isNotUndefined(fileList) && fileList.length > 0) {
-              fileList.forEach((file) => {
-                this.fileList.push(file);
-                this.fileIndexes.push(file.uuid);
-                this.fileNames.push(this.getFileName(configMetadataForm, file));
-              });
-            }
-
-            this.changeDetectorRef.detectChanges();
+        .subscribe(([configMetadataForm, { primary, files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+            this.primaryBitstreamUUID = primary;
+            this.fileList = files;
+            this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file));
           }
         )
     );
diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts
index a851fa9dafa..726c9fd7675 100644
--- a/src/app/submission/sections/upload/section-upload.service.ts
+++ b/src/app/submission/sections/upload/section-upload.service.ts
@@ -8,11 +8,13 @@ import { SubmissionState } from '../../submission.reducers';
 import {
   DeleteUploadedFileAction,
   EditFileDataAction,
+  EditFilePrimaryBitstreamAction,
   NewUploadedFileAction
 } from '../../objects/submission-objects.actions';
-import { submissionUploadedFileFromUuidSelector, submissionUploadedFilesFromIdSelector } from '../../selectors';
+import { submissionSectionDataFromIdSelector, submissionUploadedFileFromUuidSelector, submissionUploadedFilesFromIdSelector } from '../../selectors';
 import { isUndefined } from '../../../shared/empty.util';
 import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
 /**
  * A service that provides methods to handle submission's bitstream state.
@@ -27,6 +29,22 @@ export class SectionUploadService {
    */
   constructor(private store: Store<SubmissionState>) {}
 
+  /**
+   * Return submission's bitstream data from state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @returns {WorkspaceitemSectionUploadObject}
+   *    Returns submission's bitstream data
+   */
+  public getUploadedFilesData(submissionId: string, sectionId: string): Observable<WorkspaceitemSectionUploadObject> {
+    return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
+      map((state) => state),
+      distinctUntilChanged());
+  }
+
   /**
    * Return submission's bitstream list from state
    *
@@ -104,6 +122,22 @@ export class SectionUploadService {
     );
   }
 
+   /**
+   * Update primary bitstream into the state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @param fileUUID
+   *    The bitstream UUID
+   */
+   public updateFilePrimaryBitstream(submissionId: string, sectionId: string, fileUUID: string) {
+    this.store.dispatch(
+      new EditFilePrimaryBitstreamAction(submissionId, sectionId, fileUUID)
+    );
+  }
+
   /**
    * Update bitstream metadata into the state
    *

From bbc8b6ac8a15bdd619d4f7dac90655ab52dbad2c Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Mon, 23 Oct 2023 18:34:13 +0200
Subject: [PATCH 03/20] [CST-12043] unit tests

---
 .../mocks/section-upload.service.mock.ts      |  3 +
 src/app/shared/mocks/submission.mock.ts       |  6 ++
 .../objects/submission-objects.actions.ts     |  4 +-
 ...section-upload-file-edit.component.spec.ts | 30 ++++--
 .../section-upload-file-edit.component.ts     | 51 ++++++----
 .../edit/section-upload-file-edit.model.ts    |  4 +-
 .../file/section-upload-file.component.html   | 10 +-
 .../section-upload-file.component.spec.ts     | 22 ++++-
 .../file/section-upload-file.component.ts     | 95 +++----------------
 .../upload/section-upload.component.spec.ts   | 24 +++--
 .../upload/section-upload.service.spec.ts     | 63 ++++++++++++
 .../sections/upload/section-upload.service.ts | 23 ++++-
 12 files changed, 207 insertions(+), 128 deletions(-)
 create mode 100644 src/app/submission/sections/upload/section-upload.service.spec.ts

diff --git a/src/app/shared/mocks/section-upload.service.mock.ts b/src/app/shared/mocks/section-upload.service.mock.ts
index ae3515105d9..4e872522c33 100644
--- a/src/app/shared/mocks/section-upload.service.mock.ts
+++ b/src/app/shared/mocks/section-upload.service.mock.ts
@@ -5,6 +5,9 @@ import { SubmissionFormsConfigDataService } from '../../core/config/submission-f
  */
 export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
+    updatePrimaryBitstreamOperation: jasmine.createSpy('updatePrimaryBitstreamOperation'),
+    updateFilePrimaryBitstream: jasmine.createSpy('updateFilePrimaryBitstream'),
+    getUploadedFilesData: jasmine.createSpy('getUploadedFilesData'),
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),
     getDefaultPolicies: jasmine.createSpy('getDefaultPolicies'),
diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index 268ae33ab39..bec08013c35 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -1612,7 +1612,13 @@ export const mockUploadFiles = [
   }
 ];
 
+export const mockUploadFilesData = {
+  primary: null,
+  files: JSON.parse(JSON.stringify(mockUploadFiles))
+};
+
 export const mockFileFormData = {
+  primary: [true],
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 2f1ecf7fa85..86d90f05f30 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -766,7 +766,7 @@ export class EditFilePrimaryBitstreamAction implements Action {
   payload: {
     submissionId: string;
     sectionId: string;
-    fileId: string;
+    fileId: string | null;
   };
 
   /**
@@ -779,7 +779,7 @@ export class EditFilePrimaryBitstreamAction implements Action {
    * @param fileId
    *    the file's ID
    */
-  constructor(submissionId: string, sectionId: string, fileId: string) {
+  constructor(submissionId: string, sectionId: string, fileId: string | null) {
     this.payload = { submissionId, sectionId, fileId: fileId };
   }
 }
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index d008bf61f1c..865f59d80d5 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -47,6 +47,7 @@ import {
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import { of } from 'rxjs';
+import { DynamicCustomSwitchModel } from '../../../../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 
 const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
   add: jasmine.createSpy('add'),
@@ -78,7 +79,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   const fileIndex = '0';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
-  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -183,11 +184,15 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
 
       comp.ngOnInit();
 
+      const models = [DynamicCustomSwitchModel, DynamicFormGroupModel, DynamicFormArrayModel];
+
       expect(comp.formModel).toBeDefined();
-      expect(comp.formModel.length).toBe(2);
-      expect(comp.formModel[0] instanceof DynamicFormGroupModel).toBeTruthy();
-      expect(comp.formModel[1] instanceof DynamicFormArrayModel).toBeTruthy();
-      expect((comp.formModel[1] as DynamicFormArrayModel).groups.length).toBe(2);
+      expect(comp.formModel.length).toBe(models.length);
+      models.forEach((model, i) => {
+        expect(comp.formModel[i] instanceof model).toBeTruthy();
+      });
+
+      expect((comp.formModel[2] as DynamicFormArrayModel).groups.length).toBe(2);
       const startDateModel = formbuilderService.findById('startDate', comp.formModel);
       expect(startDateModel.max).toEqual(maxStartDate);
       const endDateModel = formbuilderService.findById('endDate', comp.formModel);
@@ -251,6 +256,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       compAsAny.formRef = {formGroup: null};
       compAsAny.fileData = fileData;
       compAsAny.pathCombiner = pathCombiner;
+      compAsAny.isPrimary = null;
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(of(true));
       formService.getFormData.and.returnValue(of(mockFileFormData));
@@ -259,6 +265,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         Object.assign(mockSubmissionObject, {
           sections: {
             upload: {
+              primary: true,
               files: mockUploadFiles
             }
           }
@@ -274,23 +281,28 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       comp.saveBitstreamData();
       tick();
 
-      let path = 'metadata/dc.title';
+      let path = 'primary';
+      expect(uploadService.updatePrimaryBitstreamOperation).toHaveBeenCalledWith(pathCombiner.getPath(path),  compAsAny.isPrimary,  mockFileFormData.primary[0], compAsAny.fileId);
+
+      const pathFragment = ['files', fileIndex];
+
+      path = 'metadata/dc.title';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.title'],
         true
       );
 
       path = 'metadata/dc.description';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.description'],
         true
       );
 
       path = 'accessConditions';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         accessConditionsToSave,
         true
       );
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 648271b7b78..d2b387dc32c 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -29,7 +29,6 @@ import {
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
   BITSTREAM_FORM_PRIMARY,
-  BITSTREAM_FORM_PRIMARY_LAYOUT,
   BITSTREAM_METADATA_FORM_GROUP_CONFIG,
   BITSTREAM_METADATA_FORM_GROUP_LAYOUT
 } from './section-upload-file-edit.model';
@@ -42,7 +41,7 @@ import { SubmissionService } from '../../../../submission.service';
 import { FormService } from '../../../../../shared/form/form.service';
 import { FormComponent } from '../../../../../shared/form/form.component';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, mergeMap, take, tap } from 'rxjs/operators';
+import { filter, mergeMap, take } from 'rxjs/operators';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 
 
@@ -54,10 +53,12 @@ import {
   JsonPatchOperationPathCombiner
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SectionUploadService } from '../../section-upload.service';
-import { Observable, Subject, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
 import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
 import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+import { SubmissionObject } from 'src/app/core/submission/models/submission-object.model';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
 /**
  * This component represents the edit form for bitstream
@@ -168,12 +169,6 @@ export class SubmissionSectionUploadFileEditComponent
 
   protected subscriptions: Subscription[] = [];
 
-  private onSaveBitstreamData$: Subject<any> = new Subject();
-
-  get saveBitstreamDataEvent$(): Observable<void> {
-    return this.onSaveBitstreamData$.asObservable();
-  }
-
   /**
    * Initialize instance variables
    *
@@ -206,8 +201,8 @@ export class SubmissionSectionUploadFileEditComponent
    */
   public initModelData(formModel: DynamicFormControlModel[]) {
 
-    const primaryBitstreammodel: any = this.formBuilderService.findById('primaryBitstream', formModel, this.fileIndex);
-    primaryBitstreammodel.value = this.isPrimary || false;
+    const primaryBitstreamModel: any = this.formBuilderService.findById('primary', formModel, this.fileIndex);
+    primaryBitstreamModel.value = this.isPrimary || false;
 
     this.fileData.accessConditions.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
@@ -417,12 +412,14 @@ export class SubmissionSectionUploadFileEditComponent
 
     // validate form
     this.formService.validateAllFormFields(this.formRef.formGroup);
-    const subscription = this.formService.isValid(this.formId).pipe(
+    const saveBitstreamDataSubscription = this.formService.isValid(this.formId).pipe(
       take(1),
       filter((isValid) => isValid),
       mergeMap(() => this.formService.getFormData(this.formId)),
       take(1),
-      tap((formData: any) => {
+      mergeMap((formData: any) => {
+        this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, formData.primary[0], this.fileId);
+
         // collect bitstream metadata
         Object.keys((formData.metadata))
           .filter((key) => isNotEmpty(formData.metadata[key]))
@@ -494,9 +491,31 @@ export class SubmissionSectionUploadFileEditComponent
         if (isNotEmpty(accessConditionsToSave)) {
           this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, 'accessConditions']), accessConditionsToSave, true);
         }
-      })
-    ).subscribe((formData) => this.onSaveBitstreamData$.next(formData));
-    this.subscriptions.push(subscription);
+       // dispatch a PATCH request to save metadata
+       return this.operationsService.jsonPatchByResourceID(
+        this.submissionService.getSubmissionObjectLinkName(),
+        this.submissionId,
+        this.pathCombiner.rootElement,
+        this.pathCombiner.subRootElement);
+    })
+    ).subscribe((result: SubmissionObject[]) => {
+      const section = result[0].sections[this.sectionId];
+      if (!section) {
+        return;
+      }
+      const uploadSection = (section as WorkspaceitemSectionUploadObject);
+
+      this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, uploadSection.primary);
+
+      Object.keys(uploadSection.files)
+        .filter((key) => uploadSection.files[key].uuid === this.fileId)
+        .forEach((key) => this.uploadService.updateFileData(
+          this.submissionId, this.sectionId, this.fileId, uploadSection.files[key])
+        );
+      this.isSaving = false;
+      this.activeModal.close();
+    });
+    this.subscriptions.push(saveBitstreamDataSubscription);
   }
 
   private unsubscribeAll() {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 8d021732819..c658d4b87e4 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -64,8 +64,8 @@ export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
 };
 
 export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
-  id: 'primaryBitstream',
-  name: 'primaryBitstream',
+  id: 'primary',
+  name: 'primary',
   label: 'Primary bitstream',
 };
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index d4acd10e772..10b27c11a1a 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -3,13 +3,19 @@
     <!-- Default switch -->
     <div class="col-md-2 d-flex justify-content-center align-items-center" >
       <div class="custom-control custom-switch">
-        <input type="checkbox" class="custom-control-input" id="primaryBitstream{{fileIndex}}" [(ngModel)]="isPrimary" (change)="togglePrimaryBitstream()">
+        <input 
+        type="checkbox" 
+        class="custom-control-input" 
+        id="primaryBitstream{{fileIndex}}" 
+        [disabled]="processingSaveStatus$ | async"
+        [checked]="isPrimary" 
+        (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}"></label>
       </div>
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
-        <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
+        <h3>{{fileName}}<span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
       <div class="float-right w-15">
         <ng-container>
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 4f62ceef6c6..c12991c55f2 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'),
@@ -201,6 +201,23 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
       });
     });
 
+    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({}));
@@ -209,7 +226,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 2e268ed3a36..f95e8213ca9 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,8 +8,8 @@ import {
     ViewChild
 } from '@angular/core';
 
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter, switchMap, tap } from 'rxjs/operators';
+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,14 +21,10 @@ 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';
 import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
-import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
-import { SubmissionObject } from 'src/app/core/submission/models/submission-object.model';
-import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -45,14 +40,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    * it will be null if no primary bitstream is set for the ORIGINAL bundle
    * @type {boolean, null}
    */
-  @Input() set isPrimaryBitstream(status: boolean | null) {
-    this.initialPrimaryStatus = status;
-    this.isPrimary = status;
-  }
-
-
-  private initialPrimaryStatus = false;
-  isPrimary = false;
+  @Input() isPrimary: boolean | null;
 
   /**
    * The list of available access condition
@@ -116,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<boolean>}
+   */
+  public processingSaveStatus$: Observable<boolean>;
 
   /**
    * The bitstream's metadata data
@@ -184,10 +177,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    * @param {SectionUploadService} uploadService
    */
   constructor(
-    private cdr: ChangeDetectorRef,
     private formService: FormService,
-    private halService: HALEndpointService,
-    private notificationsService: NotificationsService,
     private modalService: NgbModal,
     private operationsBuilder: JsonPatchOperationsBuilder,
     private operationsService: SubmissionJsonPatchOperationsService,
@@ -220,6 +210,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   ngOnInit() {
     this.formId = this.formService.getUniqueId(this.fileId);
+    this.processingSaveStatus$ = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId);
     this.loadFormMetadata();
   }
@@ -249,23 +240,6 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     });
   }
 
-  private updatePrimaryBitstream(primaryBitstream: boolean): void {
-    const path = this.pathCombiner.getPath('primary');
-
-    if (this.isPrimary === null && primaryBitstream) {
-      this.operationsBuilder.add(path, this.fileId, false, true);
-      return;
-    }
-
-    if (this.isPrimary !== primaryBitstream) {
-      if (primaryBitstream) {
-        this.operationsBuilder.replace(path, this.fileId, true);
-        return;
-      }
-      this.operationsBuilder.remove(path);
-    }
-  }
-
   editBitstreamData() {
 
     const options: NgbModalOptions = {
@@ -288,50 +262,10 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     activeModal.componentInstance.pathCombiner = this.pathCombiner;
     activeModal.componentInstance.submissionId = this.submissionId;
     activeModal.componentInstance.isPrimary = this.isPrimary;
-
-    activeModal.componentInstance.saveBitstreamDataEvent$.pipe(
-    // TODO: uncoment
-    tap((data: any) => {
-      this.updatePrimaryBitstream(data.primaryBitstream[0]);
-    }),
-      switchMap(() => this.patchFileOperations())
-    ).subscribe((result: SubmissionObject[]) => {
-      this.uploadFileData(result);
-      activeModal.componentInstance.isSaving = false;
-      activeModal.close();
-    });
-  }
-
-  private uploadFileData(result: SubmissionObject[]) {
-    const section = result[0].sections[this.sectionId];
-    if (!section) {
-      return;
-    }
-    let uploadSection = (section as WorkspaceitemSectionUploadObject);
-    uploadSection = {...uploadSection, primary: this.fileId};
-
-    // TODO: update only if primary bitstream changed
-    // TODO: if the result contains primary id of this file of null then update
-    this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, this.fileId);
-
-    Object.keys(uploadSection.files)
-      .filter((key) => uploadSection.files[key].uuid === this.fileId)
-      .forEach((key) => {
-        this.uploadService.updateFileData(
-        this.submissionId, this.sectionId, this.fileId, uploadSection.files[key]);
-    });
-  }
-
-  private patchFileOperations() {
-    return this.operationsService.jsonPatchByResourceID(
-      this.submissionService.getSubmissionObjectLinkName(),
-      this.submissionId,
-      this.pathCombiner.rootElement,
-      this.pathCombiner.subRootElement);
   }
 
-  togglePrimaryBitstream() {
-    this.updatePrimaryBitstream(!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);
   }
 
@@ -359,10 +293,8 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
    */
   protected deleteFile() {
     this.operationsBuilder.remove(this.pathCombiner.getPath(['files', this.fileIndex]));
-
     if (this.isPrimary) {
-      // TODO: uncoment
-      // this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
+      this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
     }
 
     this.subscriptions.push(this.operationsService.jsonPatchByResourceID(
@@ -371,6 +303,9 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
       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/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 068fc5c7660..eaa510a696c 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -25,6 +25,7 @@ import {
   mockUploadConfigResponse,
   mockUploadConfigResponseNotRequired,
   mockUploadFiles,
+  mockUploadFilesData,
 } from '../../../shared/mocks/submission.mock';
 import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
 import { SectionUploadService } from './section-upload.service';
@@ -160,6 +161,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
     };
 
     TestBed.configureTestingModule({
@@ -230,7 +232,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should init component properly', () => {
-
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
@@ -246,15 +248,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
-
       comp.onSectionInit();
 
-      const expectedGroupsMap = new Map([
-        [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
-        [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
-      ]);
-
       expect(comp.collectionId).toBe(collectionId);
       expect(comp.collectionName).toBe(mockCollection.name);
       expect(comp.availableAccessConditionOptions.length).toBe(4);
@@ -262,12 +257,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual([]);
-      expect(compAsAny.fileIndexes).toEqual([]);
       expect(compAsAny.fileNames).toEqual([]);
-
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
     });
 
     it('should init file list properly', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
@@ -282,7 +277,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf(mockUploadFilesData));
 
       comp.onSectionInit();
 
@@ -298,12 +293,14 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual(mockUploadFiles);
-      expect(compAsAny.fileIndexes).toEqual(['123456-test-upload']);
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
       expect(compAsAny.fileNames).toEqual(['123456-test-upload.jpg']);
 
     });
 
     it('should properly read the section status when required is true', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
+
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
@@ -324,7 +321,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       comp.onSectionInit();
 
-      expect(comp.required$.getValue()).toBe(true);
+       expect(comp.required$.getValue()).toBe(true);
 
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
         c: false,
@@ -335,6 +332,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     it('should properly read the section status when required is false', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
diff --git a/src/app/submission/sections/upload/section-upload.service.spec.ts b/src/app/submission/sections/upload/section-upload.service.spec.ts
new file mode 100644
index 00000000000..e1d2abe0486
--- /dev/null
+++ b/src/app/submission/sections/upload/section-upload.service.spec.ts
@@ -0,0 +1,63 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, waitForAsync } from '@angular/core/testing';
+import { JsonPatchOperationPathCombiner } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
+import { SectionUploadService } from './section-upload.service';
+import { Store, StoreModule } from '@ngrx/store';
+
+const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+  add: jasmine.createSpy('add'),
+  replace: jasmine.createSpy('replace'),
+  remove: jasmine.createSpy('remove'),
+});
+
+describe('SectionUploadService test suite', () => {
+  let sectionUploadService: SectionUploadService;
+  let operationsBuilder: any;
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', 'upload');
+  const primaryPath = pathCombiner.getPath('primary');
+  const fileId = 'test';
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [StoreModule],
+      providers: [
+        { provide: Store, useValue: {} },
+        SectionUploadService,
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    });
+  }));
+
+  beforeEach(() => {
+    sectionUploadService = TestBed.inject(SectionUploadService);
+    operationsBuilder = TestBed.inject(JsonPatchOperationsBuilder);
+  });
+
+  [
+    {
+        initialPrimary: null,
+        primary: true,
+        operationName: 'add',
+        expected: [primaryPath, fileId, false, true]
+    },
+    {
+        initialPrimary: true,
+        primary: false,
+        operationName: 'remove',
+        expected: [primaryPath]
+    },
+    {
+        initialPrimary: false,
+        primary: true,
+        operationName: 'replace',
+        expected: [primaryPath,  fileId, true]
+    }
+  ].forEach(({ initialPrimary, primary, operationName, expected }) => {
+    it(`updatePrimaryBitstreamOperation should add ${operationName} operation`, () => {
+        const path = pathCombiner.getPath('primary');
+        sectionUploadService.updatePrimaryBitstreamOperation(path, initialPrimary, primary, fileId);
+        expect(operationsBuilder[operationName]).toHaveBeenCalledWith(...expected);
+      });
+  });
+});
diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts
index 726c9fd7675..599e8ccbe26 100644
--- a/src/app/submission/sections/upload/section-upload.service.ts
+++ b/src/app/submission/sections/upload/section-upload.service.ts
@@ -15,6 +15,8 @@ import { submissionSectionDataFromIdSelector, submissionUploadedFileFromUuidSele
 import { isUndefined } from '../../../shared/empty.util';
 import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
+import { JsonPatchOperationPathObject } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
 
 /**
  * A service that provides methods to handle submission's bitstream state.
@@ -26,8 +28,25 @@ export class SectionUploadService {
    * Initialize service variables
    *
    * @param {Store<SubmissionState>} store
+   * @param {JsonPatchOperationsBuilder} operationsBuilder
    */
-  constructor(private store: Store<SubmissionState>) {}
+  constructor(private store: Store<SubmissionState>, private operationsBuilder: JsonPatchOperationsBuilder) {}
+
+
+  public updatePrimaryBitstreamOperation(path: JsonPatchOperationPathObject, intitialPrimary: boolean | null, primary: boolean | null, fileId: string): void {
+    if (intitialPrimary === null && primary) {
+      this.operationsBuilder.add(path, fileId, false, true);
+      return;
+    }
+
+    if (intitialPrimary !== primary) {
+      if (primary) {
+        this.operationsBuilder.replace(path, fileId, true);
+        return;
+      }
+      this.operationsBuilder.remove(path);
+    }
+  }
 
   /**
    * Return submission's bitstream data from state
@@ -132,7 +151,7 @@ export class SectionUploadService {
    * @param fileUUID
    *    The bitstream UUID
    */
-   public updateFilePrimaryBitstream(submissionId: string, sectionId: string, fileUUID: string) {
+   public updateFilePrimaryBitstream(submissionId: string, sectionId: string, fileUUID: string | null) {
     this.store.dispatch(
       new EditFilePrimaryBitstreamAction(submissionId, sectionId, fileUUID)
     );

From ae93cc0076e2756da335e5e53702b2d54ca4b15c Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 24 Oct 2023 12:05:12 +0200
Subject: [PATCH 04/20] [CST-12043] fix: translation for custom switch

---
 .../models/custom-switch/custom-switch.component.html         | 2 +-
 .../upload/file/edit/section-upload-file-edit.component.ts    | 3 ++-
 .../upload/file/edit/section-upload-file-edit.model.ts        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index 572c99ad3a7..033a898f884 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -14,7 +14,7 @@
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
   <label class="form-check-label custom-control-label"  [for]="bindId && model.id">
-    <span [innerHTML]="model.label"
+    <span [innerHTML]="model.label | translate"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>
 </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index d2b387dc32c..f7d68c0a368 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -29,6 +29,7 @@ import {
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
   BITSTREAM_FORM_PRIMARY,
+  BITSTREAM_FORM_PRIMARY_LAYOUT,
   BITSTREAM_METADATA_FORM_GROUP_CONFIG,
   BITSTREAM_METADATA_FORM_GROUP_LAYOUT
 } from './section-upload-file-edit.model';
@@ -305,7 +306,7 @@ export class SubmissionSectionUploadFileEditComponent
     });
     const formModel: DynamicFormControlModel[] = [];
 
-    formModel.push(new DynamicCustomSwitchModel(BITSTREAM_FORM_PRIMARY, BITSTREAM_METADATA_FORM_GROUP_LAYOUT));
+    formModel.push(new DynamicCustomSwitchModel(BITSTREAM_FORM_PRIMARY, BITSTREAM_FORM_PRIMARY_LAYOUT));
 
     const metadataGroupModelConfig = Object.assign({}, BITSTREAM_METADATA_FORM_GROUP_CONFIG);
     metadataGroupModelConfig.group = this.formBuilderService.modelFromConfiguration(
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index c658d4b87e4..06c86e532eb 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -58,7 +58,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayo
   }
 };
 export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
-  grid: {
+  element: {
     host: 'col-6'
   }
 };
@@ -66,7 +66,7 @@ export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
 export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
   id: 'primary',
   name: 'primary',
-  label: 'Primary bitstream',
+  label: 'bitstream.edit.form.primaryBitstream.label'
 };
 
 

From 6fc75a57e64c4779369328cae41161a8a7004670 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 24 Oct 2023 12:06:14 +0200
Subject: [PATCH 05/20] [CST-12043] ref: add and update documentation

---
 .../sections/upload/section-upload.component.ts    |  2 +-
 .../sections/upload/section-upload.service.ts      | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 9281cdfb349..ed64d514f98 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -197,7 +197,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
       }),
 
 
-      // retrieve submission's bitstreams from state
+      // retrieve submission's bitstream data from state
       combineLatest([this.configMetadataForm$,
         this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id)]).pipe(
         filter(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts
index 599e8ccbe26..ef32ea4cfdc 100644
--- a/src/app/submission/sections/upload/section-upload.service.ts
+++ b/src/app/submission/sections/upload/section-upload.service.ts
@@ -32,7 +32,19 @@ export class SectionUploadService {
    */
   constructor(private store: Store<SubmissionState>, private operationsBuilder: JsonPatchOperationsBuilder) {}
 
-
+ /**
+   * Define and add an operation based on a change
+   *
+   * @param path
+   *    The path to endpoint
+   * @param intitialPrimary
+   *    The initial primary indicator
+   * @param primary
+   *    the new primary indicator
+    * @param fileId
+   *    The file id
+   * @returns {void}
+   */
   public updatePrimaryBitstreamOperation(path: JsonPatchOperationPathObject, intitialPrimary: boolean | null, primary: boolean | null, fileId: string): void {
     if (intitialPrimary === null && primary) {
       this.operationsBuilder.add(path, fileId, false, true);

From 7c723caa15ac78a1dc94b1da9982c37c671e4137 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 24 Oct 2023 12:52:46 +0200
Subject: [PATCH 06/20] [CST-12043] fix: redundant space

---
 .../file/edit/section-upload-file-edit.component.html      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index c5c737e4e13..0cb79e51cb0 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,12 +1,11 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-      <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
-        <span aria-hidden="true">×</span>
-      </button>
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
+      <span aria-hidden="true">×</span>
+    </button>
   </div>
   <div class="modal-body">
-
     <ds-form *ngIf="formModel"
              #formRef="formComponent"
              [formId]="formId"

From f006bb3dffbf6241b9e6612478f3894d1c23b8cb Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Wed, 25 Oct 2023 18:01:27 +0200
Subject: [PATCH 07/20] [CST-12043]  fix: dependencies for unit test

---
 .../models/custom-switch/custom-switch.component.spec.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
index ceb498fe567..4d626e7cdd3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
@@ -1,11 +1,12 @@
 import { DynamicFormsCoreModule, DynamicFormService } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement } from '@angular/core';
+import { DebugElement} from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { DynamicCustomSwitchModel } from './custom-switch.model';
 import { CustomSwitchComponent } from './custom-switch.component';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('CustomSwitchComponent', () => {
 
@@ -20,9 +21,10 @@ describe('CustomSwitchComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        TranslateModule.forRoot(),
         ReactiveFormsModule,
         NoopAnimationsModule,
-        DynamicFormsCoreModule.forRoot()
+        DynamicFormsCoreModule.forRoot(),
       ],
       declarations: [CustomSwitchComponent]
 

From 7cee04dd2d3786a11174b1f263a29fb6064175f7 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Wed, 25 Oct 2023 18:29:48 +0200
Subject: [PATCH 08/20] [CST-12044] feature:  badge for primary bitstream

---
 .../core/data/bitstream-data.service.spec.ts  | 34 ++++++++++++++++++
 src/app/core/data/bitstream-data.service.ts   | 36 +++++++++++++++++--
 .../file-section/file-section.component.html  |  5 ++-
 .../file-section.component.spec.ts            | 17 ++++++++-
 .../file-section/file-section.component.ts    | 12 +++++++
 5 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 89178f8dd21..ccdff75fdb9 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -21,6 +21,11 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import objectContaining = jasmine.objectContaining;
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BundleDataService } from './bundle-data.service';
+import { ItemMock } from 'src/app/shared/mocks/item.mock';
+import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
+import { Bundle } from '../shared/bundle.model';
+import { cold } from 'jasmine-marbles';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -29,6 +34,7 @@ describe('BitstreamDataService', () => {
   let halService: HALEndpointService;
   let bitstreamFormatService: BitstreamFormatDataService;
   let rdbService: RemoteDataBuildService;
+  let bundleDataService: BundleDataService;
   const bitstreamFormatHref = 'rest-api/bitstreamformats';
 
   const bitstream1 = Object.assign(new Bitstream(), {
@@ -62,6 +68,7 @@ describe('BitstreamDataService', () => {
     bitstreamFormatService = jasmine.createSpyObj('bistreamFormatService', {
       getBrowseEndpoint: observableOf(bitstreamFormatHref)
     });
+
     rdbService = getMockRemoteDataBuildService();
 
     TestBed.configureTestingModule({
@@ -76,6 +83,7 @@ describe('BitstreamDataService', () => {
       ],
     });
     service = TestBed.inject(BitstreamDataService);
+    bundleDataService = TestBed.inject(BundleDataService);
   });
 
   describe('composition', () => {
@@ -118,6 +126,32 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream1-self');
     });
 
+    describe('findPrimaryBitstreamByItemAndName', () => {
+      it('should return primary bitstream', () => {
+        const exprected$ = cold('(a|)', { a: bitstream1} );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createSuccessfulRemoteDataObject(bitstream1)),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return null if primary bitstream has not be succeeded ', () => {
+        const exprected$ = cold('(a|)', { a: null} );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createFailedRemoteDataObject()),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return EMPTY if nothing where found', () => {
+        const exprected$ = cold('(|)', {} );
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createFailedRemoteDataObject<Bundle>()));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+    });
+
     it('should be able to delete multiple bitstreams', () => {
       service.removeMultiple([bitstream1, bitstream2]);
 
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bb4ec281665..97949ffa25c 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,9 +1,9 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, EMPTY } from 'rxjs';
 import { find, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { FollowLinkConfig, followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
@@ -34,6 +34,7 @@ import { NoContent } from '../shared/NoContent.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
 import { Operation, RemoveOperation } from 'fast-json-patch';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -201,6 +202,37 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }
 
+
+  /**
+   *
+   * Make a request to get primary bitstream
+   * in all current use cases, and having it simplifies this method
+   *
+   * @param item                        the {@link Item} the {@link Bundle} is a part of
+   * @param bundleName                  the name of the {@link Bundle} we want to find
+   *                                    {@link Bitstream}s for
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @return {Observable<Bitstream | null>}
+   *    Return an observable that constains primary bitstream information or null
+   */
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<Bundle>) => {
+        if (!rd.hasSucceeded) {
+          return EMPTY;
+        }
+        return rd.payload.primaryBitstream.pipe(
+          getFirstCompletedRemoteData(),
+          map((rdb: RemoteData<Bitstream>) => rdb.hasSucceeded ? rdb.payload : null)
+        );
+      })
+    );
+  }
+
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index cd708510e8c..38b2905beaa 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -2,7 +2,10 @@
   <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
     <div class="file-section">
       <ds-themed-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
-        <span>{{ dsoNameService.getName(file) }}</span>
+        <span>
+          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">Primary</span> 
+          {{ dsoNameService.getName(file) }}
+        </span>
         <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
       </ds-themed-file-download-link>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
index 8acf405b55f..4a825e50c91 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -25,7 +25,8 @@ describe('FileSectionComponent', () => {
   let fixture: ComponentFixture<FileSectionComponent>;
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findPrimaryBitstreamByItemAndName: observableOf(null)
   });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(),
@@ -81,6 +82,20 @@ describe('FileSectionComponent', () => {
     fixture.detectChanges();
   }));
 
+  it('should set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(mockBitstream));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBe(mockBitstream.id);
+  });
+
+  it('should not set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(null));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBeUndefined();
+  });
+
   describe('when the bitstreams are loading', () => {
     beforeEach(() => {
       comp.bitstreams$.next([mockBitstream]);
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
index 3c41731c5f4..76f33de9063 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
@@ -39,6 +39,8 @@ export class FileSectionComponent implements OnInit {
 
   pageSize: number;
 
+  primaryBitsreamId: string;
+
   constructor(
     protected bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
@@ -50,9 +52,19 @@ export class FileSectionComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.getPrimaryBitstreamId();
     this.getNextPage();
   }
 
+  private getPrimaryBitstreamId() {
+    this.bitstreamDataService.findPrimaryBitstreamByItemAndName(this.item, 'ORIGINAL', true, true).subscribe((primaryBitstream: Bitstream | null) => {
+      if (!primaryBitstream) {
+        return;
+      }
+      this.primaryBitsreamId = primaryBitstream?.id;
+    });
+  }
+
   /**
    * This method will retrieve the next page of Bitstreams from the external BitstreamDataService call.
    * It'll retrieve the currentPage from the class variables and it'll add the next page of bitstreams with the

From c644cc5102517d5bdd10cb54cdaf9aac5a01cda8 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Wed, 25 Oct 2023 18:30:54 +0200
Subject: [PATCH 09/20] [CST-12044] feature: add code coverage flag

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2116da6a0e3..53044bbd637 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "build:prod": "yarn run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "test": "ng test --source-map=true --watch=false --configuration test",
-    "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
+    "test:watch": "nodemon --exec \"ng test --source-map=true --code-coverage --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
     "lint": "ng lint",
     "lint-fix": "ng lint --fix=true",

From 462aafb487431d6fca72b5d4eb883fece04a4834 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Thu, 26 Oct 2023 12:51:01 +0200
Subject: [PATCH 10/20] [CST-12044] feature: add translation for badge

---
 .../field-components/file-section/file-section.component.html   | 2 +-
 src/assets/i18n/en.json5                                        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 38b2905beaa..eee29603a54 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -3,7 +3,7 @@
     <div class="file-section">
       <ds-themed-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
         <span>
-          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">Primary</span> 
+          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">{{ 'item.page.bitstreams.primary' | translate }}</span> 
           {{ dsoNameService.getName(file) }}
         </span>
         <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ecbc43a6602..66f02b59e24 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2435,6 +2435,8 @@
   "item.page.bitstreams.view-more": "Show more",
 
   "item.page.bitstreams.collapse": "Collapse",
+  
+  "item.page.bitstreams.primary": "Primary",
 
   "item.page.filesection.original.bundle": "Original bundle",
 

From ca64baca43b1e641f5ccbd4b7f9dcda03a0b31cd Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Mon, 30 Oct 2023 12:46:05 +0100
Subject: [PATCH 11/20] [CST-12043] feature: add title

---
 .../sections/upload/section-upload.component.html      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index 5b245d37c2d..41e912e613a 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -18,6 +18,16 @@
       </ds-alert>
     </div>
   </div>
+  <div class="row">
+    <div class="col-md-2">
+      <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <hr/>
+    </div>
+  </div>
   <ng-container *ngFor="let fileEntry of fileList; let i = index;">
     <ds-themed-submission-upload-section-file
                                        [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"

From 0f1f4e82e63e000d0c112a8b083efc21abed070d Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 31 Oct 2023 12:45:09 +0100
Subject: [PATCH 12/20] [CST-12043] feature: add label position

---
 .../custom-switch/custom-switch.component.html   |  2 +-
 .../custom-switch/custom-switch.component.scss   | 16 ++++++++++++++++
 .../file/edit/section-upload-file-edit.model.ts  |  8 +++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index 033a898f884..cfda5d19d00 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
+<div [formGroup]="group" class="form-check custom-control custom-switch text-right" [class.text-right]="layout.element.textAlign === 'end'" [class.custom-control-right]="model.labelPosition === 'start'" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
index e69de29bb2d..206ad174929 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
@@ -0,0 +1,16 @@
+div.custom-switch {
+  &.custom-control-right {
+    margin-left: 0;
+    margin-right: 0;
+
+    &::after {
+      right: -1.5rem;
+      left: auto;
+    }
+
+    &::before {
+      right: -2.35rem;
+      left: auto;
+    }
+  }
+}
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 06c86e532eb..0c6b6a1c51b 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -59,14 +59,16 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayo
 };
 export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+    textAlign: 'end'
+  },
 };
 
 export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
   id: 'primary',
   name: 'primary',
-  label: 'bitstream.edit.form.primaryBitstream.label'
+  label: 'bitstream.edit.form.primaryBitstream.label',
+  labelPosition: 'start',
 };
 
 

From 41eb34b7f4a047760a9312347bf6c2bb86789c62 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 3 Nov 2023 22:10:10 +0100
Subject: [PATCH 13/20] [CST-12043] Add class for element container

---
 .../models/custom-switch/custom-switch.component.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index cfda5d19d00..5beb8d52dab 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" class="form-check custom-control custom-switch text-right" [class.text-right]="layout.element.textAlign === 'end'" [class.custom-control-right]="model.labelPosition === 'start'" [class.disabled]="model.disabled">
+<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
@@ -13,7 +13,7 @@
          (blur)="onBlur($event)"
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
-  <label class="form-check-label custom-control-label"  [for]="bindId && model.id">
+  <label class="form-check-label custom-control-label" [for]="bindId && model.id">
     <span [innerHTML]="model.label | translate"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>

From 034d7ddbbcf4f0c81c01c6c6e42e655bd2311f8d Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 3 Nov 2023 22:11:26 +0100
Subject: [PATCH 14/20] [CST-12043] Remove ng-deep styles

---
 .../edit-bitstream-page.component.scss        | 12 ------
 .../edit-bitstream-page.component.ts          | 40 +++++++++++++++----
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
index 80adde4ecca..e69de29bb2d 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
@@ -1,12 +0,0 @@
-:host {
-  ::ng-deep {
-    .switch {
-      position: absolute;
-      top: calc(var(--bs-spacer) * 2.5);
-    }
-  }
-}
-:host ::ng-deep ds-dynamic-form-control-container > div > label {
-  margin-top: 1.75rem;
-}
-
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b77d2151a9b..7aad6df2fb2 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -2,14 +2,35 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription
+} from 'rxjs';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicFormService,
+  DynamicInputModel,
+  DynamicSelectModel
+} from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
-import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+import {
+  DynamicCustomSwitchModel
+} from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import cloneDeep from 'lodash/cloneDeep';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload
+} from '../../core/shared/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
@@ -245,7 +266,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * All input models in a simple array for easier iterations
    */
-  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel,
+  inputModels = [this.primaryBitstreamModel, this.fileNameModel, this.descriptionModel, this.selectedFormatModel,
     this.newFormatModel];
 
   /**
@@ -256,8 +277,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     new DynamicFormGroupModel({
       id: 'fileNamePrimaryContainer',
       group: [
-        this.fileNameModel,
-        this.primaryBitstreamModel
+        this.primaryBitstreamModel,
+        this.fileNameModel
       ]
     }, {
       grid: {
@@ -295,7 +316,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     },
     primaryBitstream: {
       grid: {
-        host: 'col col-sm-4 d-inline-block switch border-0'
+        container: 'col-12'
+      },
+      element: {
+        container: 'text-right'
       }
     },
     description: {

From 9ce9606c38eaf3a03c9ea6e49838ef6dbcc1d739 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 3 Nov 2023 22:12:00 +0100
Subject: [PATCH 15/20] [CST-12043] Fix layout

---
 .../upload/file/edit/section-upload-file-edit.model.ts     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 0c6b6a1c51b..f14fd3be5ab 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -59,16 +59,15 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayo
 };
 export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'col-6',
-    textAlign: 'end'
+    host: 'col-12',
+    container: 'text-right'
   },
 };
 
 export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
   id: 'primary',
   name: 'primary',
-  label: 'bitstream.edit.form.primaryBitstream.label',
-  labelPosition: 'start',
+  label: 'bitstream.edit.form.primaryBitstream.label'
 };
 
 

From 71af428a16322d966f7240cf1348ca82a1e49cf9 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Fri, 10 Nov 2023 18:13:09 +0100
Subject: [PATCH 16/20] [CST-12044] refactor: styles

---
 .../upload/file/themed-section-upload-file.component.ts         | 2 +-
 src/assets/i18n/en.json5                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 3bc334673e3..952813e03c9 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
@@ -18,7 +18,7 @@ export class ThemedSubmissionSectionUploadFileComponent
   @Input() availableAccessConditionOptions: any[];
 
    /**
-   * The indicator is the primary bitstream 
+   * The indicator is the primary bitstream
    * it will be null if no primary bitstream is set for the ORIGINAL bundle
    * @type {boolean, null}
    */
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 66f02b59e24..818c25e58f7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2435,7 +2435,7 @@
   "item.page.bitstreams.view-more": "Show more",
 
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   "item.page.bitstreams.primary": "Primary",
 
   "item.page.filesection.original.bundle": "Original bundle",

From b86525990d6733b2d0e604518920161b20ef5b09 Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 6 Feb 2024 13:23:02 +0100
Subject: [PATCH 17/20] [CST-12044] refactor: code

---
 package.json                                               | 2 +-
 .../upload/file/section-upload-file.component.html         | 7 +++++--
 src/assets/i18n/en.json5                                   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 53044bbd637..2116da6a0e3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "build:prod": "yarn run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "test": "ng test --source-map=true --watch=false --configuration test",
-    "test:watch": "nodemon --exec \"ng test --source-map=true --code-coverage --watch=true --configuration test\"",
+    "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
     "lint": "ng lint",
     "lint-fix": "ng lint --fix=true",
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 10b27c11a1a..ff7b503af9d 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -10,12 +10,15 @@
         [disabled]="processingSaveStatus$ | async"
         [checked]="isPrimary" 
         (change)="togglePrimaryBitstream($event)">
-        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}"></label>
+        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
+          <span class="sr-only" aria-hidden="true" *ngIf="!isPrimary">Make {{fileName}} the primary bitstream</span>
+          <span class="sr-only" aria-hidden="true" *ngIf="isPrimary">Remove {{fileName}} as the primary bitstream</span>
+        </label>
       </div>
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
-        <h3>{{fileName}}<span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
+        <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
       <div class="float-right w-15">
         <ng-container>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 818c25e58f7..9705e3564f0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -700,7 +700,7 @@
 
   "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
 
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Primary File",
 
   "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
 

From 18e62f47063c05498443a45a3b1381299cd493ce Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Tue, 6 Feb 2024 14:57:03 +0100
Subject: [PATCH 18/20] [CST-12044] fix accept/reject the license bug

---
 src/app/submission/sections/license/section-license.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index e9a0cf15668..4b2e6761cc6 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -213,6 +213,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
     } else {
       this.operationsBuilder.remove(this.pathCombiner.getPath(path));
     }
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionData.id);
   }
 
   /**

From c596b6c7ecb4ca9b462d9a6b609bebedde87bddb Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Wed, 7 Feb 2024 08:31:06 +0100
Subject: [PATCH 19/20] [CST-12044] refactor: code

---
 .../sections/upload/file/section-upload-file.component.html   | 4 ++--
 src/assets/i18n/en.json5                                      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index ff7b503af9d..d320996f9ff 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -11,8 +11,8 @@
         [checked]="isPrimary" 
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
-          <span class="sr-only" aria-hidden="true" *ngIf="!isPrimary">Make {{fileName}} the primary bitstream</span>
-          <span class="sr-only" aria-hidden="true" *ngIf="isPrimary">Remove {{fileName}} as the primary bitstream</span>
+          <span class="sr-only" aria-hidden="true" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          <span class="sr-only" aria-hidden="true" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
         </label>
       </div>
     </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 9705e3564f0..dbbc48f2099 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4434,6 +4434,10 @@
 
   "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
 
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+
   "submission.sections.upload.delete.confirm.cancel": "Cancel",
 
   "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",

From 02baf8683185aacb47b829b5b7e40d2aade628cc Mon Sep 17 00:00:00 2001
From: Vlad Nouski <uladzislau.nouski@4science.com>
Date: Thu, 15 Feb 2024 17:32:46 +0100
Subject: [PATCH 20/20] [CST-12044] removed aria hidden attribute

---
 .../sections/upload/file/section-upload-file.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index d320996f9ff..fba198f347a 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -11,8 +11,8 @@
         [checked]="isPrimary" 
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
-          <span class="sr-only" aria-hidden="true" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
-          <span class="sr-only" aria-hidden="true" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+          <span class="sr-only" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          <span class="sr-only" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
         </label>
       </div>
     </div>