From 1d05680126630c79c7328a6fffe7d7cffc719f3b Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Fri, 16 Aug 2019 13:00:04 +0200
Subject: [PATCH] Implement feedback

Change padding into margin
Change 'Create link' to a button
Add placeholder to extension field
Fix pagination
---
 resources/i18n/en.json                                 |  1 +
 .../add-bitstream-format.component.html                |  4 ++--
 .../bitstream-formats/bitstream-formats.component.html |  4 ++--
 .../bitstream-formats/bitstream-formats.component.ts   | 10 ++++++----
 .../edit-bitstream-format.component.html               |  4 ++--
 .../format-form/format-form.component.ts               |  5 +++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index c63e52e4b3..9a4e49d433 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -17,6 +17,7 @@
   "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
   "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extenstion without the dot",
   "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
index c05f3badeb..2b65b369b2 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
+++ b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="row">
-        <div class="col-12 pb-4">
+        <div class="col-12 mb-4">
             <h2 id="sub-header"
-                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
+                class="border-bottom mb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
 
             <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
 
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index ec1993c0f4..7dd325338a 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -2,10 +2,10 @@
   <div class="bitstream-formats row">
     <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
+      <h2 id="header" class="border-bottom mb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
-      <p id="create-new" class="pb-2"><a [routerLink]="'add'">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
+      <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
 
 
       <ds-pagination
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 5a619e3e05..737fb59c77 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -36,7 +36,7 @@ export class BitstreamFormatsComponent implements OnInit {
    * Currently simply renders all bitstream formats
    */
   config: FindAllOptions = Object.assign(new FindAllOptions(), {
-    elementsPerPage: 10000
+    elementsPerPage: 20
   });
 
   /**
@@ -45,7 +45,7 @@ export class BitstreamFormatsComponent implements OnInit {
    */
   pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-bitstreamformats-pagination',
-    pageSize: 10000
+    pageSize: 20
   });
 
   constructor(private notificationsService: NotificationsService,
@@ -142,9 +142,11 @@ export class BitstreamFormatsComponent implements OnInit {
    * @param event The page change event
    */
   onPageChange(event) {
-    this.config.currentPage = event;
+    this.config = Object.assign(new FindAllOptions(), this.config, {
+      currentPage: event,
+    });
     this.pageConfig.currentPage = event;
-    this.updateFormats();
+    this.pageState.next('pageChange');
   }
 
   ngOnInit(): void {
diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
index 8e7f2c7451..f57ec9cd38 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
+++ b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="row">
-        <div class="col-12 pb-4">
+        <div class="col-12 mb-4">
             <h2 id="sub-header"
-                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
+                class="border-bottom mb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
 
              <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
 
diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index febf56bc9f..505ccccd91 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -4,7 +4,7 @@ import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-f
 import {
   DynamicCheckboxModel,
   DynamicFormArrayModel,
-  DynamicFormControlLayout,
+  DynamicFormControlLayout, DynamicFormControlLayoutConfig,
   DynamicFormControlModel,
   DynamicFormService,
   DynamicInputModel,
@@ -49,7 +49,7 @@ export class FormatFormComponent implements OnInit {
   arrayElementLayout: DynamicFormControlLayout = {
     grid: {
       group: 'form-row',
-    }
+    },
   };
 
   /**
@@ -114,6 +114,7 @@ export class FormatFormComponent implements OnInit {
       groupFactory: () => [
         new DynamicInputModel({
           id: 'extension',
+          placeholder: 'admin.registries.bitstream-formats.edit.extensions.placeholder',
         }, this.arrayInputElementLayout)
       ]
     }, this.arrayElementLayout),