From 323ff29aab2b5ec7c1a2caf6fdbc95b2c00d6124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=A7=D0=B8=D0=BA=D0=B0=D0=BB=D0=BA=D0=B8=D0=BD?= Date: Wed, 23 Sep 2020 17:19:52 +0300 Subject: [PATCH] fix generate names in options --- src/core/fakeData/entityFakes.ts | 1 + src/core/tools/data.js | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/fakeData/entityFakes.ts b/src/core/fakeData/entityFakes.ts index 3d8cf2d..9f68add 100644 --- a/src/core/fakeData/entityFakes.ts +++ b/src/core/fakeData/entityFakes.ts @@ -30,6 +30,7 @@ const entityFakeData: { name: 'Account10101010', }, { + name: 'Account2525252346346', accountid: '123123123123', evo_account_type: 100000001, statecode: 0, diff --git a/src/core/tools/data.js b/src/core/tools/data.js index dc3529a..0c6dba5 100644 --- a/src/core/tools/data.js +++ b/src/core/tools/data.js @@ -5,10 +5,13 @@ export function objectToOption(obj, entityName) { console.warn(`Warning: ${entityName} not found in propsMap!`); return obj; } + + const name = obj[propsMap[entityName]['name']] || obj['name']; + const value = obj[propsMap[entityName]['value']]; const optionatedObject = { ...obj, - name: obj[propsMap[entityName]['name']] || `Unknown ${entityName}`, - value: obj[propsMap[entityName]['value']], + name, + value, }; return optionatedObject; }