From 91060537bbbbdaf8888d0109b475c55dd6b7ad73 Mon Sep 17 00:00:00 2001 From: okbel Date: Wed, 16 May 2018 11:51:28 -0300 Subject: [PATCH 1/3] displaying multiple provider ids --- .../coral-admin/src/components/UserDetail.js | 19 ++++++++++++++++--- .../coral-admin/src/containers/UserDetail.js | 1 + .../src/routes/Community/components/People.js | 9 ++++++++- locales/en.yml | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index 5dabc5b6f..de69f8a93 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -185,11 +185,24 @@ class UserDetail extends React.Component { {new Date(user.created_at).toLocaleString()} - {user.profiles.map(({ id }) => ( +
  • + + + {t('user_detail.email')}: + + {user.email}{' '} + +
  • + + {user.profiles.map(({ provider, id }) => (
  • - + - {t('user_detail.email')}: + {capitalize(provider)} {t('user_detail.id')}: {id}{' '} - {user.profiles.map(({ id }) => id)} + {user.email + ? user.email + : user.profiles.map(({ id }, i) => { + if (i === user.profiles.length - 1) { + return id; + } + return `${id}, `; + })} diff --git a/locales/en.yml b/locales/en.yml index 36cf956b4..0c25c2c94 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -467,6 +467,7 @@ en: all: "All" rejected: "Rejected" user_history: "User History" + id: "ID" user_history: user_banned: "User banned" ban_removed: "Ban removed" From 2524004e2a5e50cf7eeb6a5ab90d5c6482ea3926 Mon Sep 17 00:00:00 2001 From: okbel Date: Wed, 16 May 2018 11:55:05 -0300 Subject: [PATCH 2/3] Styling --- client/coral-admin/src/components/UserDetail.css | 4 ++++ client/coral-admin/src/components/UserDetail.js | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/components/UserDetail.css b/client/coral-admin/src/components/UserDetail.css index 58faee5c4..389971b32 100644 --- a/client/coral-admin/src/components/UserDetail.css +++ b/client/coral-admin/src/components/UserDetail.css @@ -143,3 +143,7 @@ border-color: #E45241; color: white; } + +.userDetailItem { + padding: 2px 0; +} diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index de69f8a93..a61ee81ec 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -177,7 +177,7 @@ class UserDetail extends React.Component {
      -
    • +
    • {t('user_detail.member_since')}: @@ -185,7 +185,7 @@ class UserDetail extends React.Component { {new Date(user.created_at).toLocaleString()}
    • -
    • +
    • {t('user_detail.email')}: @@ -199,7 +199,7 @@ class UserDetail extends React.Component {
    • {user.profiles.map(({ provider, id }) => ( -
    • +
    • {capitalize(provider)} {t('user_detail.id')}: From 1f40d6b7bbf79a81c678157f18f67ecc232c71db Mon Sep 17 00:00:00 2001 From: okbel Date: Fri, 18 May 2018 13:05:46 -0300 Subject: [PATCH 3/3] replacing by a one liner :) --- .../coral-admin/src/routes/Community/components/People.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js index 6d1457cb8..ce9a8b75a 100644 --- a/client/coral-admin/src/routes/Community/components/People.js +++ b/client/coral-admin/src/routes/Community/components/People.js @@ -132,12 +132,7 @@ class People extends React.Component { {user.email ? user.email - : user.profiles.map(({ id }, i) => { - if (i === user.profiles.length - 1) { - return id; - } - return `${id}, `; - })} + : user.profiles.map(p => p.id).join(', ')}