From 1619d7baef34863b06b11bcf41ec602bd7fc6b5c Mon Sep 17 00:00:00 2001
From: Wenyi Luo <wenyluo@microsoft.com>
Date: Tue, 31 Dec 2019 16:51:11 +0800
Subject: [PATCH 1/2] fix authoring region and language fixed error

---
 .../src/pages/language-understanding/publish-luis-modal.js    | 4 ++--
 Composer/packages/server/src/models/bot/luPublisher.ts        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js b/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js
index b17e141391..619ff9a692 100644
--- a/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js
+++ b/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js
@@ -170,13 +170,13 @@ export const PublishLuis = props => {
           />
           <TextField
             label={formatMessage('Authoring Region')}
-            defaultValue={defaultFields.authoringRegion}
+            defaultValue={formData.authoringRegion || defaultFields.authoringRegion}
             onRenderLabel={onRenderLabel(Tips.AUTHORING_REGION)}
             disabled
           />
           <TextField
             label={formatMessage('Default Language')}
-            defaultValue={defaultFields.defaultLanguage}
+            defaultValue={formData.defaultLanguage || defaultFields.defaultLanguage}
             onRenderLabel={onRenderLabel(Tips.DEFAULT_LANGUAGE)}
             disabled
           />
diff --git a/Composer/packages/server/src/models/bot/luPublisher.ts b/Composer/packages/server/src/models/bot/luPublisher.ts
index 1ac494e468..11c0544d6a 100644
--- a/Composer/packages/server/src/models/bot/luPublisher.ts
+++ b/Composer/packages/server/src/models/bot/luPublisher.ts
@@ -94,7 +94,7 @@ export class LuPublisher {
       });
       await this.saveStatus();
     } catch (error) {
-      throw new Error('Error publishing to LUIS.');
+      throw new Error((error.body && error.body.error && error.body.error.message) || 'Error publishing to LUIS.');
     }
 
     await this._copyDialogsToTargetFolder(config);

From b469938cd5c66dd7abe0d7810ad26f3c5fcaf742 Mon Sep 17 00:00:00 2001
From: Wenyi Luo <wenyluo@microsoft.com>
Date: Fri, 3 Jan 2020 11:23:33 +0800
Subject: [PATCH 2/2] fix comments

---
 Composer/packages/server/src/models/bot/luPublisher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/server/src/models/bot/luPublisher.ts b/Composer/packages/server/src/models/bot/luPublisher.ts
index 11c0544d6a..f117227f8a 100644
--- a/Composer/packages/server/src/models/bot/luPublisher.ts
+++ b/Composer/packages/server/src/models/bot/luPublisher.ts
@@ -94,7 +94,7 @@ export class LuPublisher {
       });
       await this.saveStatus();
     } catch (error) {
-      throw new Error((error.body && error.body.error && error.body.error.message) || 'Error publishing to LUIS.');
+      throw new Error(error?.body?.error?.message ?? 'Error publishing to LUIS.');
     }
 
     await this._copyDialogsToTargetFolder(config);