Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
beat.editor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
beat
beat.editor
Commits
84f20c77
Commit
84f20c77
authored
May 09, 2019
by
Jaden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[js] fix number parsing with range form elements in parameters
Also adds tests for negative numbers
parent
751ea946
Pipeline
#30078
passed with stages
in 23 minutes and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
5 deletions
+87
-5
conda/js/src/components/ParameterCreate.jsx
conda/js/src/components/ParameterCreate.jsx
+8
-4
conda/js/src/components/ParameterCreate.spec.jsx
conda/js/src/components/ParameterCreate.spec.jsx
+79
-1
No files found.
conda/js/src/components/ParameterCreate.jsx
View file @
84f20c77
...
...
@@ -266,13 +266,15 @@ export default class ParameterCreate extends React.Component<Props, State> {
<
FormGroup
row
>
<
Col
>
<
InputGroup
>
<
InputGroupAddon
>
Min
</
InputGroupAddon
>
<
InputGroupAddon
addonType=
'prepend'
>
Min
</
InputGroupAddon
>
<
Input
type=
'number'
step=
{
param
.
type
.
startsWith
(
'
float
'
)
?
'
any
'
:
'
1
'
}
value=
{
param
.
range
[
0
]
}
onChange=
{
e
=>
{
const
num
=
e
.
target
.
value
;
const
num
=
Number
.
parseFloat
(
e
.
target
.
value
);
if
(
Number
.
isNaN
(
num
))
return
;
const
max
=
param
.
range
[
1
];
if
(
num
>
max
){
return
;
...
...
@@ -295,14 +297,16 @@ export default class ParameterCreate extends React.Component<Props, State> {
</
Col
>
<
Col
>
<
InputGroup
>
<
InputGroupAddon
>
Max
</
InputGroupAddon
>
<
InputGroupAddon
addonType=
'prepend'
>
Max
</
InputGroupAddon
>
<
Input
type=
'number'
step=
{
param
.
type
.
startsWith
(
'
float
'
)
?
'
any
'
:
'
1
'
}
value=
{
param
.
range
[
1
]
}
required
onChange=
{
e
=>
{
const
num
=
e
.
target
.
value
;
const
num
=
Number
.
parseFloat
(
e
.
target
.
value
);
if
(
Number
.
isNaN
(
num
))
return
;
const
min
=
param
.
range
[
0
];
if
(
num
<
min
){
return
;
...
...
conda/js/src/components/ParameterCreate.spec.jsx
View file @
84f20c77
...
...
@@ -63,7 +63,7 @@ describe('<ParameterCreate />', () => {
});
});
describe
.
only
(
'
regression
'
,
()
=>
{
describe
(
'
regression
'
,
()
=>
{
it
(
`doesnt let min be larger than max in a range parameter`
,
()
=>
{
let
param
=
{
type
:
'
int8
'
,
...
...
@@ -98,6 +98,45 @@ describe('<ParameterCreate />', () => {
expect
(
updateParameter
.
callCount
).
to
.
equal
(
1
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
2
,
2
]);
});
it
(
`doesnt let min be larger than max in a range parameter for negative numbers`
,
()
=>
{
let
param
=
{
type
:
'
int8
'
,
default
:
''
,
description
:
''
,
range
:
[
-
1
,
-
2
]
};
const
updateParameter
=
sinon
.
spy
(
_updateParameter
);
wrapper
=
mount
(
<
C
name=
{
name
}
param=
{
param
}
params=
{
params
}
updateParameter=
{
updateParameter
}
/>
);
// sanity checks
expect
(
wrapper
.
find
(
'
TypedField
'
)).
to
.
have
.
prop
(
'
name
'
,
name
);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
0
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
1
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
0
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
1
,
-
2
]);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
0
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
2
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
1
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
2
,
-
2
]);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
0
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
3
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
2
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
3
,
-
2
]);
});
it
(
`doesnt let max be smaller than min in a range parameter`
,
()
=>
{
let
param
=
{
type
:
'
int8
'
,
...
...
@@ -132,5 +171,44 @@ describe('<ParameterCreate />', () => {
expect
(
updateParameter
.
callCount
).
to
.
equal
(
1
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
3
,
3
]);
});
it
(
`doesnt let max be smaller than min in a range parameter for negative numbers`
,
()
=>
{
let
param
=
{
type
:
'
int8
'
,
default
:
''
,
description
:
''
,
range
:
[
-
3
,
-
2
]
};
const
updateParameter
=
sinon
.
spy
(
_updateParameter
);
wrapper
=
mount
(
<
C
name=
{
name
}
param=
{
param
}
params=
{
params
}
updateParameter=
{
updateParameter
}
/>
);
// sanity checks
expect
(
wrapper
.
find
(
'
TypedField
'
)).
to
.
have
.
prop
(
'
name
'
,
name
);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
1
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
5
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
0
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
3
,
-
2
]);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
1
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
3
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
1
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
3
,
-
3
]);
wrapper
.
find
(
'
Input[step="1"]
'
).
at
(
1
).
prop
(
'
onChange
'
)(
{
target
:
{
value
:
-
1
}});
wrapper
.
update
();
expect
(
updateParameter
.
callCount
).
to
.
equal
(
2
);
expect
(
wrapper
.
props
().
param
.
range
).
to
.
deep
.
equal
([
-
3
,
-
1
]);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment