Disable invalid space error on url on carriage returns (#1464)

* run query on Enter
microsoftgraph · Feb 22, 2022 · b99d239 · b99d239
1 parent 87c2228
commit b99d239
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx b/src/app/views/query-runner/query-input/auto-complete/AutoComplete.tsx
@@ -145,6 +145,7 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
  const selected = filteredSuggestions[activeSuggestion];
  this.appendSuggestionToUrl(selected);
  } else {
+ event.preventDefault();
  this.props.contentChanged(queryUrl);
  this.props.runQuery();
  }
@@ -250,7 +251,7 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
  }
 
  private setSuggestions(suggestions: string[], compare?: string) {
- const sortedSuggestions = suggestions.sort(dynamicSort(null, SortOrder.ASC));
+ const sortedSuggestions = this.sortSuggestions(suggestions);
  this.setState({
  filteredSuggestions: sortedSuggestions,
  suggestions: sortedSuggestions,
@@ -259,6 +260,10 @@ class AutoComplete extends Component<IAutoCompleteProps, IAutoCompleteState> {
  });
  }
 
+ private sortSuggestions(suggestions: string[]): string[]{
+ return suggestions.sort(dynamicSort(null, SortOrder.ASC));
+ }
+
  public componentDidUpdate = (prevProps: IAutoCompleteProps) => {
  if (prevProps.autoCompleteOptions !== this.props.autoCompleteOptions) {
  if (this.props.autoCompleteOptions) {

diff --git a/src/tests/utils/sample-url-generation.spec.tsx b/src/tests/utils/sample-url-generation.spec.tsx
@@ -87,7 +87,8 @@ describe('hasWhiteSpaces should', () => {
  {url: 'https://graph.microsoft.com/v1.0/ me', output: true},
  {url:
  'https://graph.microsoft.com/v1.0/me/contacts?$filter=emailAddresses/any(a:a/address eq \'garth@contoso.com\')',
- output: false}
+ output: false},
+ {url: 'https://graph.microsoft.com/v1.0/me ', output: true}
  ];
  invalidUrls.forEach(invalidUrl => {
  it(`validate whitespaces in the url: ${invalidUrl.url}`, () => {