这是indexloc提供的服务，不要输入任何密码
Skip to content

add placeholder for bool type fields while inserting rows (close #1948) #1962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2019
Merged

add placeholder for bool type fields while inserting rows (close #1948) #1962

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b2d977
add placeholder while inserting bool value in console
rikinsk Apr 8, 2019
8d88b3b
refactor
rikinsk Apr 8, 2019
892c5e0
Merge branch 'master' into console-fix-bool-insert
rikinsk Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 18 additions & 35 deletions console/src/components/Services/Data/TableInsertItem/InsertItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand All @@ -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;

Expand All @@ -93,15 +93,15 @@ class InsertItem extends Component {
},
onFocus: e => {
if (isAutoIncrement) return;
if (!isNullable && !isDefault) return;
if (!isNullable && !hasDefault) return;

const textValue = e.target.value;
if (
textValue === undefined ||
textValue === null ||
textValue.length === 0
) {
const radioToSelectWhenEmpty = isDefault
const radioToSelectWhenEmpty = hasDefault
? refs[colName].defaultNode
: refs[colName].nullNode;

Expand Down Expand Up @@ -152,40 +152,13 @@ class InsertItem extends Component {
e.target.focus();
}}
>
<option value="" disabled>-- bool --</option>
<option value="true">True</option>
<option value="false">False</option>
</select>
);
}

let showDefaultOption = (
<input
type="radio"
ref={node => {
refs[colName].defaultNode = node;
}}
name={colName + '-value'}
value="option3"
defaultChecked={isDefault}
data-test={`typed-input-default-${i}`}
/>
);
if (!isDefault) {
showDefaultOption = (
<input
disabled
type="radio"
ref={node => {
refs[colName].defaultNode = node;
}}
name={colName + '-value'}
value="option3"
defaultChecked={isDefault}
data-test={`typed-input-default-${i}`}
/>
);
}

return (
<div key={i} className="form-group">
<label
Expand All @@ -203,7 +176,7 @@ class InsertItem extends Component {
}}
name={colName + '-value'}
value="option1"
defaultChecked={!isDefault & !isNullable}
defaultChecked={!hasDefault & !isNullable}
/>
{typedInput}
</label>
Expand All @@ -222,7 +195,17 @@ class InsertItem extends Component {
<span className={styles.radioSpan}>NULL</span>
</label>
<label className={styles.radioLabel + ' radio-inline'}>
{showDefaultOption}
<input
disabled={!hasDefault}
type="radio"
ref={node => {
refs[colName].defaultNode = node;
}}
name={colName + '-value'}
value="option3"
defaultChecked={hasDefault}
data-test={`typed-input-default-${i}`}
/>
<span className={styles.radioSpan}>Default</span>
</label>
</div>
Expand Down