From cbab3484e7594c0512124797fd0f9bab52f40e67 Mon Sep 17 00:00:00 2001
From: Alba Aliu <alba.aliu@atis.al>
Date: Fri, 17 Sep 2021 23:07:48 +0200
Subject: [PATCH 1/6] [DSC-94] reload tabs box after claim made

---
 .../edit-in-place-field/edit-in-place-field.component.html   | 4 ++--
 .../validation-suggestions.component.html                    | 2 +-
 .../validation-suggestions.component.ts                      | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index 5277fa1a3a..3918cece94 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -1,10 +1,10 @@
 <td>
     <div class="metadata-field">
         <div *ngIf="!(editable | async)">
-            <span>{{metadata?.key?.split('.').join('.&#8203;')}}</span>
+            <span disabled="true">{{metadata?.key?.split('.').join('.&#8203;')}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
-            <ds-validation-suggestions [suggestions]="(metadataFieldSuggestions | async)"
+            <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"
                                          [(ngModel)]="metadata.key"
                                          [url]="this.url"
                                          [metadata]="this.metadata"
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index f756169f94..1b958d8d9f 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -3,7 +3,7 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="checkIfValidInput(form);close();">
-  <input #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
+  <input [readonly]="disable" #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
          class="form-control suggestion_input"
          [ngClass]="{'is-invalid': !valid}"
          [dsDebounce]="debounceTime" (onDebounce)="find($event)"
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index e7301cd35a..c6f92a41b3 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -42,7 +42,10 @@ export class ValidationSuggestionsComponent extends InputSuggestionsComponent im
    * The suggestions that should be shown
    */
   @Input() suggestions: InputSuggestion[] = [];
-
+  /**
+   * The possibility to edit metadata
+   */
+  @Input() disable;
   constructor(private metadataFieldValidator: MetadataFieldValidator,
               private objectUpdatesService: ObjectUpdatesService) {
     super();

From af12fc1a519a12b1a74008ae9bfeedac450ac867 Mon Sep 17 00:00:00 2001
From: Alba Aliu <alba.aliu@atis.al>
Date: Mon, 20 Sep 2021 11:12:45 +0200
Subject: [PATCH 2/6] [DSC-192] fix

---
 .../edit-in-place-field/edit-in-place-field.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index 3918cece94..fe46906f47 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -1,7 +1,7 @@
 <td>
     <div class="metadata-field">
         <div *ngIf="!(editable | async)">
-            <span disabled="true">{{metadata?.key?.split('.').join('.&#8203;')}}</span>
+            <span >{{metadata?.key?.split('.').join('.&#8203;')}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
             <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"

From a97f55c32dc026eb703db9ecb13cb9745e75756b Mon Sep 17 00:00:00 2001
From: Alba Aliu <alba.aliu@atis.al>
Date: Fri, 17 Sep 2021 23:07:48 +0200
Subject: [PATCH 3/6] [DSC-192] disable edit metadata field name in edit mode

---
 .../edit-in-place-field/edit-in-place-field.component.html   | 4 ++--
 .../validation-suggestions.component.html                    | 2 +-
 .../validation-suggestions.component.ts                      | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index 5277fa1a3a..3918cece94 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -1,10 +1,10 @@
 <td>
     <div class="metadata-field">
         <div *ngIf="!(editable | async)">
-            <span>{{metadata?.key?.split('.').join('.&#8203;')}}</span>
+            <span disabled="true">{{metadata?.key?.split('.').join('.&#8203;')}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
-            <ds-validation-suggestions [suggestions]="(metadataFieldSuggestions | async)"
+            <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"
                                          [(ngModel)]="metadata.key"
                                          [url]="this.url"
                                          [metadata]="this.metadata"
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index f756169f94..1b958d8d9f 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -3,7 +3,7 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="checkIfValidInput(form);close();">
-  <input #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
+  <input [readonly]="disable" #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
          class="form-control suggestion_input"
          [ngClass]="{'is-invalid': !valid}"
          [dsDebounce]="debounceTime" (onDebounce)="find($event)"
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index e7301cd35a..c6f92a41b3 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -42,7 +42,10 @@ export class ValidationSuggestionsComponent extends InputSuggestionsComponent im
    * The suggestions that should be shown
    */
   @Input() suggestions: InputSuggestion[] = [];
-
+  /**
+   * The possibility to edit metadata
+   */
+  @Input() disable;
   constructor(private metadataFieldValidator: MetadataFieldValidator,
               private objectUpdatesService: ObjectUpdatesService) {
     super();

From 7214f3fe6d9c2ec37ea95857d9477ca43e99e89f Mon Sep 17 00:00:00 2001
From: Alba Aliu <alba.aliu@atis.al>
Date: Mon, 20 Sep 2021 11:12:45 +0200
Subject: [PATCH 4/6] [DSC-192] fix

---
 .../edit-in-place-field/edit-in-place-field.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index 3918cece94..fe46906f47 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -1,7 +1,7 @@
 <td>
     <div class="metadata-field">
         <div *ngIf="!(editable | async)">
-            <span disabled="true">{{metadata?.key?.split('.').join('.&#8203;')}}</span>
+            <span >{{metadata?.key?.split('.').join('.&#8203;')}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
             <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"

From b22d8358fb126aa78451ac3606bcd503756d2014 Mon Sep 17 00:00:00 2001
From: Alba Aliu <alba.aliu@atis.al>
Date: Fri, 24 Sep 2021 17:07:38 +0200
Subject: [PATCH 5/6] [DSC-112] unit testing

---
 .../edit-in-place-field.component.spec.ts     | 36 +++++++++++++++++++
 .../validation-suggestions.component.spec.ts  | 26 ++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
index 0a4df1bda5..3b71ba3a6a 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
@@ -463,4 +463,40 @@ describe('EditInPlaceFieldComponent', () => {
     });
 
   });
+
+  describe('canEditMetadataField', () => {
+    describe('when the fieldUpdate\'s changeType is currently ADD', () => {
+      beforeEach(() => {
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
+        comp.fieldUpdate.changeType = FieldChangeType.ADD;
+        fixture.detectChanges();
+      });
+      it('can edit metadata field', () => {
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+       expect(disabledMetadataField).toBe(false);
+      });
+    });
+    describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
+      beforeEach(() => {
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
+        comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
+        fixture.detectChanges();
+      });
+      it('can edit metadata field', () => {
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+        expect(disabledMetadataField).toBe(true);
+      });
+    });
+    describe('when the fieldUpdate\'s changeType is currently UPDATE', () => {
+      beforeEach(() => {
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
+        comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
+        fixture.detectChanges();
+      });
+      it('can edit metadata field', () => {
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+        expect(disabledMetadataField).toBe(true);
+      });
+    });
+  });
 });
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
index 388ed40cfe..98d9b0ac6d 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
@@ -60,4 +60,30 @@ describe('ValidationSuggestionsComponent', () => {
       expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value);
     });
   });
+  describe('can edit input', () => {
+    describe('test input field readonly property when input disable is true', () => {
+      beforeEach(() => {
+        comp.disable = true;
+        fixture.detectChanges();
+      });
+      it('it should be true', () => {
+        fixture.detectChanges();
+        let input = fixture.debugElement.query(By.css('input'));
+        let el = input.nativeElement;
+        expect(el.readOnly).toBe(true)
+      });
+    })
+    describe('test input field readonly property when input disable is false', () => {
+      beforeEach(() => {
+        comp.disable = false;
+        fixture.detectChanges();
+      });
+      it('it should be true', () => {
+        fixture.detectChanges();
+        let input = fixture.debugElement.query(By.css('input'));
+        let el = input.nativeElement;
+        expect(el.readOnly).toBe(false)
+      });
+    })
+  })
 });

From eb14b6c5ad82f729e9cc11928db6c53902c49b26 Mon Sep 17 00:00:00 2001
From: Corrado Lombardi <corrado.lombardi@4science.it>
Date: Fri, 24 Sep 2021 18:49:13 +0200
Subject: [PATCH 6/6] [DSC-192] lint fixes

---
 .../edit-in-place-field.component.spec.ts      |  9 ++++++---
 .../validation-suggestions.component.spec.ts   | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
index 3b71ba3a6a..03e8e5d720 100644
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
@@ -472,7 +472,8 @@ describe('EditInPlaceFieldComponent', () => {
         fixture.detectChanges();
       });
       it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
+          .componentInstance.disable;
        expect(disabledMetadataField).toBe(false);
       });
     });
@@ -483,7 +484,8 @@ describe('EditInPlaceFieldComponent', () => {
         fixture.detectChanges();
       });
       it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
+          .componentInstance.disable;
         expect(disabledMetadataField).toBe(true);
       });
     });
@@ -494,7 +496,8 @@ describe('EditInPlaceFieldComponent', () => {
         fixture.detectChanges();
       });
       it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable
+        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
+          .componentInstance.disable;
         expect(disabledMetadataField).toBe(true);
       });
     });
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
index 98d9b0ac6d..dad2edc30e 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
@@ -68,11 +68,11 @@ describe('ValidationSuggestionsComponent', () => {
       });
       it('it should be true', () => {
         fixture.detectChanges();
-        let input = fixture.debugElement.query(By.css('input'));
-        let el = input.nativeElement;
-        expect(el.readOnly).toBe(true)
+        const input = fixture.debugElement.query(By.css('input'));
+        const element = input.nativeElement;
+        expect(element.readOnly).toBe(true);
       });
-    })
+    });
     describe('test input field readonly property when input disable is false', () => {
       beforeEach(() => {
         comp.disable = false;
@@ -80,10 +80,10 @@ describe('ValidationSuggestionsComponent', () => {
       });
       it('it should be true', () => {
         fixture.detectChanges();
-        let input = fixture.debugElement.query(By.css('input'));
-        let el = input.nativeElement;
-        expect(el.readOnly).toBe(false)
+        const input = fixture.debugElement.query(By.css('input'));
+        const element = input.nativeElement;
+        expect(element.readOnly).toBe(false);
       });
-    })
-  })
+    });
+  });
 });