diff options
| author | Pascal Mugnier <pascal.mugnier@sonarsource.com> | 2018-05-08 11:45:36 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-05-24 20:20:47 +0200 |
| commit | 48e045181a8cf4aaeb237734390cf23962350222 (patch) | |
| tree | a0010a3c174044067ef2af1f5421578a40ba4be0 /server/sonar-web | |
| parent | 899d9a0a07566b55a2de2434266e4daeb4a65666 (diff) | |
| download | sonarqube-48e045181a8cf4aaeb237734390cf23962350222.tar.gz sonarqube-48e045181a8cf4aaeb237734390cf23962350222.zip | |
Fix reset button on navbar searchbox not working with less then 2 chars
Diffstat (limited to 'server/sonar-web')
2 files changed, 18 insertions, 5 deletions
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap index 74e05f0bbf6..d10a64ba95c 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap @@ -1,8 +1,21 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should render correctly the date inputs 1`] = ` +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly the date inputs 1`] = ` <div> - <DateRangeInput onChange={[Function]} value={ Object { "from": 2016-10-27T12:21:15.000Z, "to": 2016-12-27T12:21:15.000Z, - } } /> - <Button className="spacer-left" disabled={false} onClick={[Function]}> + <DateRangeInput + onChange={[Function]} + value={ + Object { + "from": 2016-10-27T12:21:15.000Z, + "to": 2016-12-27T12:21:15.000Z, + } + } + /> + <Button + className="spacer-left" + disabled={false} + onClick={[Function]} + > project_activity.reset_dates </Button> </div> diff --git a/server/sonar-web/src/main/js/components/controls/SearchBox.tsx b/server/sonar-web/src/main/js/components/controls/SearchBox.tsx index 84329946fed..09b7c0a8074 100644 --- a/server/sonar-web/src/main/js/components/controls/SearchBox.tsx +++ b/server/sonar-web/src/main/js/components/controls/SearchBox.tsx @@ -105,7 +105,7 @@ export default class SearchBox extends React.PureComponent<Props, State> { handleResetClick = () => { this.changeValue('', false); - if (this.props.value === undefined) { + if (this.props.value === undefined || this.props.value === '') { this.setState({ value: '' }); } if (this.input) { |