From 6b2d9773155f6cfb56fd350aced1c22036045fa3 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 8 Apr 2019 19:23:35 +0530 Subject: [PATCH 1/2] add placeholder while inserting bool value in console --- .../src/components/Services/Data/TableInsertItem/InsertItem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/console/src/components/Services/Data/TableInsertItem/InsertItem.js b/console/src/components/Services/Data/TableInsertItem/InsertItem.js index e966537619664..f2624e212ddfc 100644 --- a/console/src/components/Services/Data/TableInsertItem/InsertItem.js +++ b/console/src/components/Services/Data/TableInsertItem/InsertItem.js @@ -152,6 +152,7 @@ class InsertItem extends Component { e.target.focus(); }} > + From 8d88b3bc38fde85aa722a9e07f43c8b5e19bc87e Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 8 Apr 2019 19:48:39 +0530 Subject: [PATCH 2/2] refactor --- .../Data/TableInsertItem/InsertItem.js | 52 ++++++------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/console/src/components/Services/Data/TableInsertItem/InsertItem.js b/console/src/components/Services/Data/TableInsertItem/InsertItem.js index f2624e212ddfc..91afbd6e734d5 100644 --- a/console/src/components/Services/Data/TableInsertItem/InsertItem.js +++ b/console/src/components/Services/Data/TableInsertItem/InsertItem.js @@ -56,7 +56,7 @@ class InsertItem extends Component { const elements = columns.map((col, i) => { const colName = col.column_name; - const isDefault = col.column_default && col.column_default.trim() !== ''; + const hasDefault = col.column_default && col.column_default.trim() !== ''; const isNullable = col.is_nullable && col.is_nullable !== 'NO'; refs[colName] = { valueNode: null, nullNode: null, defaultNode: null }; @@ -81,10 +81,10 @@ class InsertItem extends Component { onClick: clicker, onChange: e => { if (isAutoIncrement) return; - if (!isNullable && !isDefault) return; + if (!isNullable && !hasDefault) return; const textValue = e.target.value; - const radioToSelectWhenEmpty = isDefault + const radioToSelectWhenEmpty = hasDefault ? refs[colName].defaultNode : refs[colName].nullNode; @@ -93,7 +93,7 @@ class InsertItem extends Component { }, onFocus: e => { if (isAutoIncrement) return; - if (!isNullable && !isDefault) return; + if (!isNullable && !hasDefault) return; const textValue = e.target.value; if ( @@ -101,7 +101,7 @@ class InsertItem extends Component { textValue === null || textValue.length === 0 ) { - const radioToSelectWhenEmpty = isDefault + const radioToSelectWhenEmpty = hasDefault ? refs[colName].defaultNode : refs[colName].nullNode; @@ -159,34 +159,6 @@ class InsertItem extends Component { ); } - let showDefaultOption = ( - { - refs[colName].defaultNode = node; - }} - name={colName + '-value'} - value="option3" - defaultChecked={isDefault} - data-test={`typed-input-default-${i}`} - /> - ); - if (!isDefault) { - showDefaultOption = ( - { - refs[colName].defaultNode = node; - }} - name={colName + '-value'} - value="option3" - defaultChecked={isDefault} - data-test={`typed-input-default-${i}`} - /> - ); - } - return (
@@ -223,7 +195,17 @@ class InsertItem extends Component { NULL