Merge 6cde5b3 into 77d9813

microsoft · Feb 12, 2019 · 8907b50 · 8907b50
2 parents 77d9813 + 6cde5b3
commit 8907b50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,3 +19,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [client] fix link to manage qna service, in PR [#1301](https://github.com/Microsoft/BotFramework-Emulator/pull/1301)
 - [client] Fixed resources pane styling issues, and added scrollbars, in PR [#1303](https://github.com/Microsoft/BotFramework-Emulator/pull/1303)
 - [client] Fixed issue where transcript tab name was being overwritten after opening the transcript a second time, in PR [#1304](https://github.com/Microsoft/BotFramework-Emulator/pull/1304)
+- [client] Fixed Azure gov checkbox and added a link to docs, in PR [#1292](https://github.com/Microsoft/BotFramework-Emulator/pull/1292)
diff --git a/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx b/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx
@@ -63,6 +63,7 @@ export interface BotCreationDialogState {
   secret: string;
   encryptKey: boolean;
   revealSecret: boolean;
+  isAzureGov: boolean;
 }
 
 export class BotCreationDialog extends React.Component<{}, BotCreationDialogState> {
@@ -85,14 +86,15 @@ export class BotCreationDialog extends React.Component<{}, BotCreationDialogStat
         appPassword: '',
         endpoint: '',
       }),
+      isAzureGov: false,
       secret: '',
       encryptKey: false,
       revealSecret: true,
     };
   }
 
   public render(): JSX.Element {
-    const { secret, bot, endpoint, encryptKey, revealSecret } = this.state;
+    const { secret, bot, endpoint, encryptKey, isAzureGov, revealSecret } = this.state;
     const secretCriteria = encryptKey ? secret : true;
 
     const requiredFieldsCompleted = bot && endpoint.endpoint && bot.name && secretCriteria;
@@ -139,7 +141,12 @@ export class BotCreationDialog extends React.Component<{}, BotCreationDialogStat
               value={endpoint.appPassword}
             />
           </Row>
-          <Checkbox label="Azure for US Government" onChange={this.onChannelServiceChange} />
+          <Row align={RowAlignment.Bottom}>
+            <Checkbox label="Azure for US Government" checked={isAzureGov} onChange={this.onChannelServiceChange} />
+            <a href="https://docs.microsoft.com/en-us/azure/azure-government/documentation-government-welcome">
+              &nbsp;Learn more.
+            </a>
+          </Row>
           <Row align={RowAlignment.Bottom}>
             <Checkbox
               className={styles.encryptKeyCheckBox}
@@ -218,6 +225,7 @@ export class BotCreationDialog extends React.Component<{}, BotCreationDialogStat
         ...this.state.endpoint,
         ...{ channelService },
       },
+      isAzureGov: checked,
     } as any);
   };