Merge branch 'coar-notify-7' of bitbucket.org:4Science/dspace-angular…

… into coar-notify-7

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html

@@ -252,8 +252,8 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
           class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
 
     <div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
-      <button (click)="openResetFormModal(resetFormModal)" class="btn btn-danger" type="button">
-        <span><i class="fas fa-trash"></i>&nbsp;{{ 'submission.general.discard.submit' | translate }}</span>
+      <button (click)="resetFormAndLeave()" class="btn btn-primary" type="button">
+        <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
       </button>
       <button class="btn btn-primary" type="submit">
         <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
@@ -299,28 +299,4 @@ <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
       </div>
 </ng-template>
 
-<ng-template #resetFormModal>
-    <div class="modal-header">
-      <h4 class="text-danger">{{'service.overview.reset-form.modal' | translate }}</h4>
-      <button (click)="closeModal()" aria-label="Close"
-              class="close" type="button">
-        <span aria-hidden="true">×</span>
-      </button>
-    </div>
-
-    <div class="modal-body">
-      <span>
-        {{ 'service.overview.reset-form.body' | translate }}
-      </span>
-    </div>
-    <div class="modal-footer">
-      <button (click)="closeModal()"
-        class="btn btn-primary"
-        id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
-      </button>
-      <button (click)="resetFormAndLeave()" class="mr-2 btn btn-danger"
-              id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
-      </button>
-      </div>
-</ng-template>
 

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts

@@ -234,10 +234,8 @@ describe('LdnServiceFormEditComponent', () => {
 
   it('should reset form and leave', () => {
     spyOn(component as any, 'sendBack');
-    spyOn(component as any, 'closeModal');
 
     component.resetFormAndLeave();
-    expect((component as any).closeModal).toHaveBeenCalled();
     expect((component as any).sendBack).toHaveBeenCalled();
   });
 });

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts

@@ -411,7 +411,6 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
    */
   resetFormAndLeave() {
     this.sendBack();
-    this.closeModal();
   }
 
   /**

src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html

@@ -7,7 +7,7 @@
   >
     <img
       class="source-logo"
-      src="assets/images/qa-coar-notify-logo.png"
+      src="assets/images/notify-coar-icon.png"
       alt="notify logo"
     />
     <ds-truncatable [id]="status">

src/assets/i18n/en.json5

@@ -4296,6 +4296,8 @@
 
   "submission.general.discard.submit": "Discard",
 
+  "submission.general.back.submit": "Back",
+
   "submission.general.info.saved": "Saved",
 
   "submission.general.info.pending-changes": "Unsaved changes",
@@ -5831,8 +5833,6 @@
 
   "menu.section.services_new": "LDN Service",
 
-  "mydspace.import": "Import",
-
   "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
   "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
 
@@ -5874,64 +5874,6 @@
 
   "service.overview.table.description": "Description",
 
-  "reciter.suggestion.loading": "Loading ...",
-
-  "reciter.suggestion.title": "Suggestions",
-
-  "reciter.suggestion.targets.description": "Below you can see all the suggestions ",
-
-  "reciter.suggestion.targets": "Current Suggestions",
-
-  "reciter.suggestion.table.name": "Researcher Name",
-
-  "reciter.suggestion.table.actions": "Actions",
-
-  "reciter.suggestion.button.review": "Review {{ total }} suggestion(s)",
-
-  "reciter.suggestion.noTargets": "No target found.",
-
-  "reciter.suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
-
-  "reciter.suggestion.evidence.type": "Type",
-
-  "reciter.suggestion.evidence.score": "Score",
-
-  "reciter.suggestion.evidence.notes": "Notes",
-
-  "reciter.suggestion.approveAndImport": "Approve & import",
-
-  "reciter.suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='/workspaceitems/{{workspaceItemId}}/edit'>View.</a>",
-
-  "reciter.suggestion.approveAndImport.bulk": "Approve & import Selected",
-
-  "reciter.suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
-
-  "reciter.suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
-
-  "reciter.suggestion.notMine": "Not mine",
-
-  "reciter.suggestion.notMine.success": "The suggestion has been discarded",
-
-  "reciter.suggestion.notMine.bulk": "Not mine Selected",
-
-  "reciter.suggestion.notMine.bulk.success": "{{ count }} suggestions have been discarded ",
-
-  "reciter.suggestion.notMine.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
-
-  "reciter.suggestion.seeEvidence": "See evidence",
-
-  "reciter.suggestion.hideEvidence": "Hide evidence",
-
-  "reciter.suggestion.suggestionFor": "Suggestion for",
-
-  "reciter.suggestion.source.oaire": "OpenAIRE Graph",
-
-  "reciter.suggestion.from.source": "from the ",
-
-  "reciter.suggestion.totalScore": "Total Score",
-
-  "reciter.suggestion.type.oaire": "OpenAIRE",
-
   "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
 
   "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",