From 3c104a460b410a25f6283288d6603e0a63b45475 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 21 Feb 2019 11:59:04 +0100
Subject: [PATCH] 59334: removed unnecessary config entry

---
 config/environment.default.js                 |  5 +--
 resources/i18n/en.json                        | 17 +++++++---
 .../edit-item-page.routing.module.ts          | 17 ++++++----
 .../edit-in-place-field.component.html        | 26 ++++++++-------
 .../edit-in-place-field.component.scss        |  4 +++
 .../item-metadata.component.spec.ts           |  4 ++-
 .../item-metadata/item-metadata.component.ts  | 33 +++++++++++++------
 .../input-suggestions.component.ts            |  2 +-
 src/styles/_custom_variables.scss             |  3 +-
 9 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/config/environment.default.js b/config/environment.default.js
index 788a1fb827..d46dc10dee 100644
--- a/config/environment.default.js
+++ b/config/environment.default.js
@@ -79,8 +79,5 @@ module.exports = {
     code: 'nl',
     label: 'Nederlands',
     active: false,
-  }],
-  item: {
-
-  }
+  }]
 };
diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 12f4547cf6..2174e0c2bf 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -123,6 +123,7 @@
         "status": {
           "head": "Item Status",
           "description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+          "title": "Item Edit -  Status",
           "labels": {
             "id": "Item Internal ID",
             "handle": "Handle",
@@ -165,16 +166,20 @@
           }
         },
         "bitstreams": {
-          "head": "Item Bitstreams"
+          "head": "Item Bitstreams",
+          "title": "Item Edit - Bitstreams"
         },
         "metadata": {
-          "head": "Item Metadata"
+          "head": "Item Metadata",
+          "title": "Item Edit -  Metadata"
         },
         "view": {
-          "head": "View Item"
+          "head": "View Item",
+          "title": "Item Edit -  Item"
         },
         "curate": {
-          "head": "Curate"
+          "head": "Curate",
+          "title": "Item Edit - Curate"
         }
       },
       "modify.overview": {
@@ -256,6 +261,10 @@
           "invalid": {
             "title": "Metadata invalid",
             "content": "Your changes were not saved. Please make sure all fields are valid before you save."
+          },
+          "saved": {
+            "title": "Metadata saved",
+            "content": "Your changes to this item's metadata were saved."
           }
         }
       }
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
index 48fd6ceb9b..223b5f7c8e 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -32,29 +32,34 @@ const ITEM_EDIT_DELETE_PATH = 'delete';
         children: [
           {
             path: '',
-            redirectTo: 'status'
+            redirectTo: 'status',
           },
           {
             path: 'status',
-            component: ItemStatusComponent
+            component: ItemStatusComponent,
+            data: { title: 'item.edit.tabs.status.title' }
           },
           {
             path: 'bitstreams',
-            component: ItemBitstreamsComponent
+            component: ItemBitstreamsComponent,
+            data: { title: 'item.edit.tabs.bitstreams.title' }
           },
           {
             path: 'metadata',
-            component: ItemMetadataComponent
+            component: ItemMetadataComponent,
+            data: { title: 'item.edit.tabs.metadata.title' }
           },
           {
             path: 'view',
             /* TODO - change when view page exists */
-            component: ItemBitstreamsComponent
+            component: ItemBitstreamsComponent,
+            data: { title: 'item.edit.tabs.view.title' }
           },
           {
             path: 'curate',
             /* TODO - change when curate page exists */
-            component: ItemBitstreamsComponent
+            component: ItemBitstreamsComponent,
+            data: { title: 'item.edit.tabs.curate.title' }
           },
         ]
       },
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 44c6cf2258..e20b2a5c84 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
@@ -23,25 +23,29 @@
     </div>
 </td>
 <td class="w-100">
-    <div *ngIf="!(editable | async)">
-        <span>{{metadata?.value}}</span>
-    </div>
-    <div *ngIf="(editable | async)" class="field-container">
+    <div class="value-field">
+        <div *ngIf="!(editable | async)">
+            <span>{{metadata?.value}}</span>
+        </div>
+        <div *ngIf="(editable | async)" class="field-container">
             <textarea class="form-control" type="textarea" [(ngModel)]="metadata.value" [dsDebounce]
                       (onDebounce)="update()"></textarea>
+        </div>
     </div>
 </td>
 <td class="text-center">
-    <div *ngIf="!(editable | async)">
-        <span>{{metadata?.language}}</span>
-    </div>
-    <div *ngIf="(editable | async)" class="field-container">
-        <input class="form-control" type="text" [(ngModel)]="metadata.language" [dsDebounce]
-               (onDebounce)="update()"/>
+    <div class="language-field">
+        <div *ngIf="!(editable | async)">
+            <span>{{metadata?.language}}</span>
+        </div>
+        <div *ngIf="(editable | async)" class="field-container">
+            <input class="form-control" type="text" [(ngModel)]="metadata.language" [dsDebounce]
+                   (onDebounce)="update()"/>
+        </div>
     </div>
 </td>
 <td class="text-center">
-    <div class="btn-group">
+    <div class="btn-group edit-field">
         <button [disabled]="!(canSetEditable() | async)" *ngIf="!(editable | async)"
                 (click)="setEditable(true)" class="btn btn-outline-primary btn-sm"
                 title="{{'item.edit.metadata.edit.buttons.edit' | translate}}">
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
index 65bdbc38e0..14782326f6 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
@@ -7,4 +7,8 @@
 
 .metadata-field {
     width: $edit-item-metadata-field-width;
+}
+
+.language-field {
+    width: $edit-item-language-field-width;
 }
\ No newline at end of file
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
index c76f03c3d7..840a086293 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
@@ -30,6 +30,7 @@ let el: HTMLElement;
 let objectUpdatesService;
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
+const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
 const date = new Date();
 const router = new RouterStub();
 let routeStub;
@@ -38,7 +39,8 @@ let itemService;
 const notificationsService = jasmine.createSpyObj('notificationsService',
   {
     info: infoNotification,
-    warning: warningNotification
+    warning: warningNotification,
+    success: successNotification
   }
 );
 const metadatum1 = Object.assign(new Metadatum(), {
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
index 46098ff69d..1df658d656 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
@@ -45,6 +45,8 @@ export class ItemMetadataComponent implements OnInit {
    */
   private discardTimeOut: number;
 
+  private notitifactionPrefix = 'item.edit.metadata.notifications.';
+
   constructor(
     private itemService: ItemDataService,
     private objectUpdatesService: ObjectUpdatesService,
@@ -82,7 +84,6 @@ export class ItemMetadataComponent implements OnInit {
       }
     });
     this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadata);
-
   }
 
   /**
@@ -99,9 +100,7 @@ export class ItemMetadataComponent implements OnInit {
    * Shows a notification to remind the user that they can undo this
    */
   discard() {
-    const title = this.translateService.instant('item.edit.metadata.notifications.discarded.title');
-    const content = this.translateService.instant('item.edit.metadata.notifications.discarded.content');
-    const undoNotification = this.notificationsService.info(title, content, { timeOut: this.discardTimeOut });
+    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), { timeOut: this.discardTimeOut });
     this.objectUpdatesService.discardFieldUpdates(this.url, undoNotification);
   }
 
@@ -147,12 +146,11 @@ export class ItemMetadataComponent implements OnInit {
             this.item = rd.payload;
             this.initializeOriginalFields();
             this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadata);
+            this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
           }
         )
       } else {
-        const title = this.translateService.instant('item.edit.metadata.notifications.invalid.title');
-        const content = this.translateService.instant('item.edit.metadata.notifications.invalid.content');
-        this.notificationsService.error(title, content);
+        this.notificationsService.error(this.getNotificationTitle('invalid'), this.getNotificationContent('invalid'));
       }
     });
   }
@@ -180,9 +178,7 @@ export class ItemMetadataComponent implements OnInit {
     this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
-          const title = this.translateService.instant('item.edit.metadata.notifications.outdated.title');
-          const content = this.translateService.instant('item.edit.metadata.notifications.outdated.content');
-          this.notificationsService.warning(title, content);
+          this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));
           this.initializeOriginalFields();
         }
       }
@@ -195,4 +191,21 @@ export class ItemMetadataComponent implements OnInit {
   private isValid() {
     return this.objectUpdatesService.isValidPage(this.url);
   }
+
+  /**
+   * Get translated notification title
+   * @param key
+   */
+  private getNotificationTitle(key: string) {
+    return this.translateService.instant(this.notitifactionPrefix + key + '.title');
+  }
+
+  /**
+   * Get translated notification content
+   * @param key
+   */
+  private getNotificationContent(key: string) {
+    return this.translateService.instant(this.notitifactionPrefix + key + '.content');
+
+  }
 }
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 2984441f03..c754ecfb97 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -63,7 +63,7 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   /**
    * Whether or not the current input is valid
    */
-  @Input() valid;
+  @Input() valid = true;
 
   /**
    * Output for when the form is submitted
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 05387e8740..aa923f829f 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -25,4 +25,5 @@ $dark-scrollbar-background: $admin-sidebar-active-bg;
 $dark-scrollbar-foreground: #47495d;
 
 $edit-item-button-min-width: 100px;
-$edit-item-metadata-field-width: 190px;
\ No newline at end of file
+$edit-item-metadata-field-width: 190px;
+$edit-item-language-field-width: 43px;
\ No newline at end of file