Custom user ID validation should no longer show when disabled.

microsoft · Oct 29, 2019 · 1378c73 · 1378c73
1 parent 90fb9d9
commit 1378c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,6 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - [client] Bumped `react` & `react-dom` to `^16.8.6` to sync with Web Chat in PR [1939](https://github.com/microsoft/BotFramework-Emulator/pull/1939)
  - [client] Fixed an issue with the `<AutoComplete />` component so that it can now accept an empty string as an input in "controlled mode" in PR [1939](https://github.com/microsoft/BotFramework-Emulator/pull/1939)
  - [tools] Adjusted e2e tests for recent updates to application DOM in PR [1941](https://github.com/microsoft/BotFramework-Emulator/pull/1941)
+ - [client] Fixed a bug that was showing the custom user ID validation message when disabled in PR [1946](https://github.com/microsoft/BotFramework-Emulator/pull/1946)
 
 
 ## v4.5.2 - 2019 - 07 - 17

diff --git a/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.tsx b/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.tsx
@@ -115,6 +115,7 @@ export class AppSettingsEditor extends React.Component<AppSettingsEditorProps, A
     const inputProps = {
       disabled: !useCustomId,
     };
+    console.log(`Show validation: ${useCustomId && !userGUID}`);
 
     return (
       <GenericDocument className={styles.appSettingsEditor}>
@@ -226,7 +227,7 @@ export class AppSettingsEditor extends React.Component<AppSettingsEditorProps, A
                   name="userGUID"
                   onChange={this.onInputChange}
                   required={useCustomId}
-                  errorMessage={userGUID ? '' : 'Enter a User ID'}
+                  errorMessage={useCustomId && !userGUID ? 'Enter a User ID' : ''}
                 />
               </Row>
             </fieldset>