TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 19:48:50 +03:00
Code Issues Projects Releases Wiki Activity

Updated members uploader mapper logic to map all known types

Browse Source
This commit is contained in:
Nazar Gargol 2020-07-09 20:52:12 +12:00
parent 21a0bc7aa9
commit 4f56e77db5
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ghost/admin/app/components/modal-import-members.js
View File

@ -15,24 +15,13 @@ import {inject as service} from '@ember/service';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
class MembersFieldMapping { class MembersFieldMapping {
_supportedImportFields = [
'email',
'name',
'note',
'subscribed_to_emails',
'stripe_customer_id',
'complimentary_plan',
'labels',
'created_at'
];
@tracked _mapping = {}; @tracked _mapping = {};
constructor(mapping) { constructor(mapping) {
// NOTE: there are only 2 distinguishable fields that could be automatically matched, which is the reason why code is just simple assignments
if (mapping) { if (mapping) {
this.set(mapping.email, 'email'); for (const [key, value] of Object.entries(mapping)) {
this.set(mapping.stripe_customer_id, 'stripe_customer_id'); this.set(value, key);
}
} }
} }

22
ghost/admin/app/services/member-import-validator.js
View File

@ -126,7 +126,7 @@ export default Service.extend({
}, },
/** /**
* Detects validated data types: * Detects supported data types and auto-detects following two needed for validation:
* 1. email * 1. email
* 2. stripe_customer_id * 2. stripe_customer_id
* *
@ -135,6 +135,22 @@ export default Service.extend({
* @param {Array} data sampled data containing non empty values * @param {Array} data sampled data containing non empty values
*/ */
_detectDataTypes(data) { _detectDataTypes(data) {
const supportedTypes = [
'email',
'name',
'note',
'subscribed_to_emails',
'stripe_customer_id',
'complimentary_plan',
'labels',
'created_at'
];
const autoDetectedTypes = [
'email',
'stripe_customer_id'
];
let mapping = {}; let mapping = {};
let i = 0; let i = 0;
// loopping through all sampled data until needed data types are detected // loopping through all sampled data until needed data types are detected
@ -154,6 +170,10 @@ export default Service.extend({
mapping.stripe_customer_id = key; mapping.stripe_customer_id = key;
continue; continue;
} }
if (!mapping[key] && supportedTypes.includes(key) && !(autoDetectedTypes.includes(key))) {
mapping[key] = key;
}
} }
i += 1; i += 1;