From e2db84d23b02594a6b00dd45b24313ebbe9905a7 Mon Sep 17 00:00:00 2001
From: Nazar Gargol <nazargargol@gmail.com>
Date: Fri, 12 Jun 2020 20:01:46 +1200
Subject: [PATCH] Updated import results response handling with new error
 format

refs https://github.com/TryGhost/Ghost/commit/7904c303a753790956f4041db92999083d2f0dfb

- Adds failed import records details to post members import screen
---
 .../app/components/modal-import-members.hbs   | 29 ++++++++++---------
 .../app/components/modal-import-members.js    | 10 +++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ghost/admin/app/components/modal-import-members.hbs b/ghost/admin/app/components/modal-import-members.hbs
index 372d27df6d..d4e849bab6 100644
--- a/ghost/admin/app/components/modal-import-members.hbs
+++ b/ghost/admin/app/components/modal-import-members.hbs
@@ -1,6 +1,6 @@
 <header class="modal-header" data-test-modal="import-members">
     <h1>
-        {{#if this.response}}
+        {{#if this.importResponse}}
             Import complete
         {{else}}
             Import members
@@ -9,24 +9,27 @@
 </header>
 <a class="close" href="" role="button" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
-{{#if this.response}}
+{{#if this.importResponse}}
     <div class="modal-body bg-whitegrey-l2 ba b--whitegrey br3">
         <table class="gh-members-import-results">
             <tr>
                 <td>Imported:</td>
-                <td align="left" data-test-text="import-members-imported">{{this.response.imported}}</td>
+                <td align="left" data-test-text="import-members-imported">{{this.importResponse.imported.count}}</td>
             </tr>
-            {{#if this.response.duplicates}}
-                <tr>
-                    <td>Duplicates:</td>
-                    <td align="left" data-test-text="import-members-duplicates">{{this.response.duplicates}}</td>
-                </tr>
-            {{/if}}
-            {{#if this.response.invalid}}
+            {{#if this.importResponse.invalid.count}}
                 <tr>
                     <td class="red">Invalid:</td>
-                    <td align="left" data-test-text="import-members-invalid" class="red">{{this.response.invalid}}</td>
+                    <td align="left" data-test-text="import-members-invalid" class="red">{{this.importResponse.invalid.count}}</td>
                 </tr>
+                <tr>
+                    <td colspan="2">Details:</td>
+                </tr>
+                {{#each this.importResponse.invalid.errors as |error|}}
+                    <tr>
+                        <td>{{error.message}}</td>
+                        <td>{{error.count}}</td>
+                    </tr>
+                {{/each}}
             {{/if}}
         </table>
     </div>
@@ -73,8 +76,8 @@
     </div>
 {{/if}}
 
-<div class="modal-footer {{if (and this.filePresent (not this.failureMessage) (not this.response)) "modal-footer-spread"}}">
-    {{#if this.response}}
+<div class="modal-footer {{if (and this.filePresent (not this.failureMessage) (not this.importResponse)) "modal-footer-spread"}}">
+    {{#if this.importResponse}}
         <button {{action "closeModal"}} disabled={{this.closeDisabled}} class="gh-btn gh-btn-blue" data-test-button="close-import-members">
             <span>Done</span>
         </button>
diff --git a/ghost/admin/app/components/modal-import-members.js b/ghost/admin/app/components/modal-import-members.js
index eba8b22ae1..2221b44f61 100644
--- a/ghost/admin/app/components/modal-import-members.js
+++ b/ghost/admin/app/components/modal-import-members.js
@@ -26,7 +26,7 @@ export default ModalComponent.extend({
     paramName: 'membersfile',
     uploading: false,
     uploadPercentage: 0,
-    response: null,
+    importResponse: null,
     failureMessage: null,
     validationErrors: null,
     labels: null,
@@ -189,8 +189,8 @@ export default ModalComponent.extend({
 
                 return xhr;
             }
-        }).then((response) => {
-            this._uploadSuccess(JSON.parse(response));
+        }).then((importResponse) => {
+            this._uploadSuccess(JSON.parse(importResponse));
         }).catch((error) => {
             this._validationFailed(error);
         }).finally(() => {
@@ -211,8 +211,8 @@ export default ModalComponent.extend({
         }
     },
 
-    _uploadSuccess(response) {
-        this.set('response', response.meta.stats);
+    _uploadSuccess(importResponse) {
+        this.set('importResponse', importResponse.meta.stats);
         // invoke the passed in confirm action to refresh member data
         this.confirm();
     },