Merged dspace-cris-7 into DSC-1379-security-for-nested-metadata-shoul-take-security-level

Author: atarix83

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html

@@ -4,17 +4,17 @@
     <div class="input-group">
       <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
           <span><i class="fas fa-search"></i> {{'vocabulary-treeview.search.form.search' | translate}}</span>
         </button>
-        <button class="btn btn-outline-secondary ml-3 flex-shrink-0" type="button" (click)="reset()">
-          <span><i class="fas fa-eraser"></i> {{'vocabulary-treeview.search.form.reset' | translate}}</span>
-        </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
-          {{'vocabulary-treeview.search.form.add' | translate}}
-        </button>
       </div>
     </div>
+    <button class="btn btn-secondary ml-3 flex-shrink-0" type="button" (click)="reset()">
+      <span><i class="fas fa-eraser"></i> {{'vocabulary-treeview.search.form.reset' | translate}}</span>
+    </button>
+    <button *ngIf="showAdd && !this.vocabularyOptions.closed" class="btn btn-secondary ml-3 flex-shrink-0" type="button" (click)="add()">
+        <span><i class="fas fa-plus"></i> {{'vocabulary-treeview.search.form.add' | translate}}</span>
+    </button>
   </div>
 </div>
 <div class="treeview-container">

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts

@@ -319,7 +319,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
    * Return an id for a given {@link VocabularyTreeItemType}
    */
   private getEntryId(entry: VocabularyTreeItemType): string {
-    return entry?.authority || entry?.otherInformation?.id || (entry as any)?.id || undefined;
+    const entryId: string = entry?.authority || entry?.otherInformation?.id || (entry as any)?.id || undefined;
+    return entryId?.startsWith(this.vocabularyOptions.name) ? entryId.replace(`${this.vocabularyOptions.name}:`, '') : entryId;
   }
 
   /**

src/app/submission/sections/license/section-license.model.ts

@@ -20,7 +20,7 @@ export const SECTION_LICENSE_FORM_MODEL = [
       required: null
     },
     errorMessages: {
-      notgranted: 'submission.sections.license.notgranted'
+      required: 'submission.sections.license.notgranted'
     },
     type: 'CHECKBOX',
   }

src/assets/i18n/en.json5

@@ -6676,6 +6676,8 @@
 
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
 
+  "vocabulary-treeview.tree.description.publication-coar-types": "Publication types",
+
   "vocabulary-treeview.info": "Select a subject to add as search filter",
 
   "uploader.browse": "browse",