From f6d0aca413c71643c7240c1b0e18f31c2f838d71 Mon Sep 17 00:00:00 2001
From: GeoffCoxMSFT <gcox@microsoft.com>
Date: Tue, 13 Apr 2021 12:29:52 -0700
Subject: [PATCH 1/4] fix: 6566 Update provision handoff copy

---
 .../ProvisionHandoff/ProvisionHandoff.tsx     | 23 +++++++++++++++----
 .../src/components/azureProvisionDialog.tsx   | 14 ++++++++---
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Composer/packages/lib/ui-shared/src/components/ProvisionHandoff/ProvisionHandoff.tsx b/Composer/packages/lib/ui-shared/src/components/ProvisionHandoff/ProvisionHandoff.tsx
index 2027abab73..33ebcbbd7f 100644
--- a/Composer/packages/lib/ui-shared/src/components/ProvisionHandoff/ProvisionHandoff.tsx
+++ b/Composer/packages/lib/ui-shared/src/components/ProvisionHandoff/ProvisionHandoff.tsx
@@ -11,12 +11,14 @@ import { IconButton } from 'office-ui-fabric-react/lib/components/Button';
 import { FontSizes, NeutralColors } from '@uifabric/fluent-theme/lib/fluent';
 import { useRef } from 'react';
 import { ITextField, TextField } from 'office-ui-fabric-react/lib/components/TextField';
+import { Link } from 'office-ui-fabric-react/lib/Link';
 
 import { DialogTypes, DialogWrapper } from '../DialogWrapper';
 
 type ProvisionHandoffProps = {
   title: string;
   developerInstructions: string;
+  learnMoreLink?: string;
   handoffInstructions: string;
   hidden: boolean;
   onBack: () => void;
@@ -43,12 +45,23 @@ export const ProvisionHandoff = (props: ProvisionHandoffProps) => {
     <DialogWrapper
       dialogType={DialogTypes.ProvisionFlow}
       isOpen={!props.hidden}
-      subText={props.developerInstructions}
       title={props.title}
       onDismiss={props.onDismiss}
     >
+      {props.developerInstructions && (
+        <div style={{ paddingBottom: '16px', fontSize: FontSizes.size14 }}>
+          <Text>{props.developerInstructions}&nbsp;&nbsp;</Text>
+          {props.learnMoreLink && (
+            <Link href={props.learnMoreLink} target="_blank">
+              {formatMessage('Learn More')}
+            </Link>
+          )}
+        </div>
+      )}
       <div>
-        <Text style={{ fontWeight: 700 }}>{formatMessage('Instructions for your Azure admin:')}</Text>
+        <Text style={{ fontSize: FontSizes.size14, fontWeight: 600 }}>
+          {formatMessage('Instructions for your Azure admin')}
+        </Text>
         <IconButton
           ariaLabel={formatMessage('Copy Icon')}
           menuIconProps={{ iconName: 'Copy' }}
@@ -73,10 +86,12 @@ export const ProvisionHandoff = (props: ProvisionHandoffProps) => {
         />
       </div>
       <TextField
-        autoAdjustHeight
         multiline
         componentRef={textFieldRef}
-        styles={{ root: { marginTop: '10px' }, fieldGroup: { backgroundColor: '#f3f2f1' } }}
+        styles={{
+          root: { marginTop: '10px' },
+          fieldGroup: { height: '200px', backgroundColor: '#f3f2f1' },
+        }}
         value={props.handoffInstructions}
       />
       <DialogFooter>
diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
index e3865830b6..8a943edfd6 100644
--- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx
+++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
@@ -326,7 +326,12 @@ export const AzureProvisionDialog: React.FC = () => {
     `;
 
     const instructions = formatMessage(
-      'A hosting environment and some Azure cognitive services are required for this bot project to be published.  You can find instructions for creating the necessary resources and communicating them back to me at the link below: \n\nSOME LINK GOES HERE\n\nIn addition, here is a customized command that you can use to automatically create the required resources:\n\n {command}',
+      '1. Run the following command and provision Azure resources on my behalf.\n' +
+        '2. Copy and paste the output JSON file, and securely share with me.\n\n' +
+        'PROVISIONING COMMAND\n' +
+        '{command}' +
+        '\n\n' +
+        'Learn more: https://aka.ms/how-to-complete-provision-handoff',
       { command: provisionComposer }
     );
 
@@ -1102,10 +1107,13 @@ export const AzureProvisionDialog: React.FC = () => {
   return (
     <Fragment>
       <ProvisionHandoff
-        developerInstructions={formatMessage('Send this to your IT admin')}
+        developerInstructions={formatMessage(
+          'Copy and share this information with your Azure admin. After your publishing profile is provisioned, you will be able to publish your bot.'
+        )}
         handoffInstructions={handoffInstructions}
         hidden={!showHandoff}
-        title={formatMessage('Generate a provisioning request')}
+        learnMoreLink="https://aka.ms/how-to-complete-provision-handoff"
+        title={formatMessage('Share resource request')}
         onBack={() => {
           setShowHandoff(false);
         }}

From f0b22bb8cfefd20408d97c0d399c977492589347 Mon Sep 17 00:00:00 2001
From: GeoffCoxMSFT <gcox@microsoft.com>
Date: Tue, 13 Apr 2021 15:58:08 -0700
Subject: [PATCH 2/4] fix: 6851

---
 .../azureResourceManager/azureResourceManager.ts    |  4 ++++
 extensions/azurePublish/src/node/index.ts           | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/extensions/azurePublish/src/node/azureResourceManager/azureResourceManager.ts b/extensions/azurePublish/src/node/azureResourceManager/azureResourceManager.ts
index 08a37f3c11..928029e64a 100644
--- a/extensions/azurePublish/src/node/azureResourceManager/azureResourceManager.ts
+++ b/extensions/azurePublish/src/node/azureResourceManager/azureResourceManager.ts
@@ -871,6 +871,10 @@ export class AzureResourceMananger {
                 name: 'FUNCTIONS_WORKER_RUNTIME',
                 value: config.workerRuntime || 'dotnet',
               },
+              {
+                name: 'WEBSITE_NODE_DEFAULT_VERSION',
+                value: '~14',
+              },
               {
                 name: 'APPINSIGHTS_INSTRUMENTATIONKEY',
                 value: config.instrumentationKey ?? '',
diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts
index d5e108f1cf..463abf651d 100644
--- a/extensions/azurePublish/src/node/index.ts
+++ b/extensions/azurePublish/src/node/index.ts
@@ -273,7 +273,18 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
     /*******************************************************************************************************************************/
     asyncProvision = async (jobId: string, config: ProvisionConfig, project: IBotProject, user): Promise<void> => {
       const { runtimeLanguage } = parseRuntimeKey(project.settings?.runtime?.key);
-      const provisionConfig: ProvisionConfig = { ...config, workerRuntime: runtimeLanguage };
+
+      // map runtime language/platform to worker runtime
+      let workerRuntime = runtimeLanguage;
+      switch (runtimeLanguage) {
+        case 'js':
+          workerRuntime = 'node';
+          break;
+        default:
+          break;
+      }
+
+      const provisionConfig: ProvisionConfig = { ...config, workerRuntime };
 
       const { name } = provisionConfig;
 

From 93ba230e68d8e640ee258679c4ba1848669d325a Mon Sep 17 00:00:00 2001
From: GeoffCoxMSFT <gcox@microsoft.com>
Date: Tue, 13 Apr 2021 17:29:20 -0700
Subject: [PATCH 3/4] Moved sign-in to config page

---
 .../src/components/azureProvisionDialog.tsx   | 84 ++++++++++++-------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
index dff4328db9..8b445fade0 100644
--- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx
+++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx
@@ -272,6 +272,7 @@ export const AzureProvisionDialog: React.FC = () => {
 
   // form options
   const [allTenants, setAllTenants] = useState<AzureTenant[]>([]);
+  const [tenantsErrorMessage, setTenantsErrorMessage] = useState<string>('');
   const [subscriptions, setSubscriptions] = useState<Subscription[] | undefined>();
   const [subscriptionsErrorMessage, setSubscriptionsErrorMessage] = useState<string>();
   const [deployLocations, setDeployLocations] = useState<DeployLocation[]>([]);
@@ -283,9 +284,6 @@ export const AzureProvisionDialog: React.FC = () => {
   const [isLoading, setIsLoading] = useState(true);
   const [loadingErrorMessage, setLoadingErrorMessage] = useState<string>();
 
-  // null = loading
-  const [loginErrorMsg, setLoginErrorMsg] = useState<string>('');
-
   const [resourceGroups, setResourceGroups] = useState<ResourceGroup[]>();
   const [errorResourceGroupName, setErrorResourceGroupName] = useState<string>();
   const [errorHostName, setErrorHostName] = useState('');
@@ -391,7 +389,6 @@ export const AzureProvisionDialog: React.FC = () => {
           sessionExpired: false,
         });
         setPageAndTitle(PageTypes.ChooseAction);
-        setLoginErrorMsg(undefined);
       } else {
         setLoadingErrorMessage(
           formatMessage(
@@ -399,32 +396,52 @@ export const AzureProvisionDialog: React.FC = () => {
           )
         );
       }
-    } else {
-      // TODO: handle when existing profile is being edited
-      // We should get an ARM token for the tenant in the profile and then fetch
-      // tenant details after to show in the UI.
-      getTenants().then((tenants) => {
-        if (isMounted.current) {
-          setAllTenants(tenants);
-          const cachedTenantId = getTenantIdFromCache();
-
-          // default to the last used tenant only if it is in the account's tenants
-          if (cachedTenantId && tenants.map((t) => t.tenantId).includes(cachedTenantId)) {
-            updateFormData('tenantId', cachedTenantId);
-          } else {
-            setTenantId(undefined);
-            if (tenants?.length > 0) {
-              // seed tenant selection with 1st tenant
-              updateFormData('tenantId', tenants[0].tenantId);
-            }
-          }
-        }
-      });
     }
-
     setIsLoading(false);
   }, []);
 
+  useEffect(() => {
+    if (page === PageTypes.ConfigProvision) {
+      if (!userShouldProvideTokens()) {
+        // TODO: handle when existing profile is being edited
+        // We should get an ARM token for the tenant in the profile and then fetch tenant details after to show in the UI.
+        // Note: For electron, getTenants may cause the sign-in dialog to appear.
+        getTenants()
+          .then((tenants) => {
+            if (isMounted.current) {
+              setAllTenants(tenants);
+
+              if (tenants.length === 0) {
+                setTenantsErrorMessage(formatMessage('No Azure Directories were found.'));
+              } else {
+                setTenantsErrorMessage(undefined);
+              }
+
+              const cachedTenantId = getTenantIdFromCache();
+
+              // default to the last used tenant only if it is in the account's tenants
+              if (cachedTenantId && tenants.map((t) => t.tenantId).includes(cachedTenantId)) {
+                updateFormData('tenantId', cachedTenantId);
+              } else {
+                setTenantId(undefined);
+                if (tenants?.length > 0) {
+                  // seed tenant selection with 1st tenant
+                  updateFormData('tenantId', tenants[0].tenantId);
+                }
+              }
+            }
+          })
+          .catch((err) => {
+            setTenantsErrorMessage(
+              formatMessage('There was a problem loading Azure directories. {errMessage}', {
+                errMessage: err.message || err.toString(),
+              })
+            );
+          });
+      }
+    }
+  }, [page]);
+
   const getTokenForTenant = (tenantId: string) => {
     getARMTokenForTenant(tenantId)
       .then((token) => {
@@ -439,17 +456,22 @@ export const AzureProvisionDialog: React.FC = () => {
           expiration: (decoded.exp || 0) * 1000, // convert to ms,
           sessionExpired: false,
         });
-        setLoginErrorMsg(undefined);
+        setTenantsErrorMessage(undefined);
       })
       .catch((err) => {
         setTenantId(undefined);
         setCurrentUser(undefined);
-        setLoginErrorMsg(err.message || err.toString());
+        setTenantsErrorMessage(
+          formatMessage('There was a problem getting the access token for the current Azure directory. {errMessage}', {
+            errMessage: err.message || err.toString(),
+          })
+        );
+        setTenantsErrorMessage(err.message || err.toString());
       });
   };
 
   useEffect(() => {
-    if (formData.tenantId) {
+    if (formData.tenantId && page === PageTypes.ConfigProvision) {
       if (formData.tenantId !== currentConfig?.tenantId) {
         // reset form data when tenant id changes
         setFormData((current) => ({
@@ -466,7 +488,7 @@ export const AzureProvisionDialog: React.FC = () => {
         getTokenForTenant(formData.tenantId);
       }
     }
-  }, [formData.tenantId]);
+  }, [formData.tenantId, page]);
 
   const getResources = async () => {
     try {
@@ -722,7 +744,7 @@ export const AzureProvisionDialog: React.FC = () => {
             'The Azure AD directory includes the tenant’s users, groups, and apps and is used to perform identity and access management functions for tenant resources.'
           )}
           disabled={allTenants.length === 1 || currentConfig?.tenantId}
-          errorMessage={loginErrorMsg}
+          errorMessage={tenantsErrorMessage}
           label={formatMessage('Azure Directory')}
           options={allTenants.map((t) => ({ key: t.tenantId, text: t.displayName }))}
           selectedKey={formData.tenantId}

From 49b18d1935a5467e1ebec853e6c85fda77caa5e9 Mon Sep 17 00:00:00 2001
From: GeoffCoxMSFT <gcox@microsoft.com>
Date: Mon, 19 Apr 2021 09:15:23 -0700
Subject: [PATCH 4/4] Fixed broken QnA image svg

---
 .../src/components/images/QnA-Maker.svg       | 42 +------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/extensions/azurePublish/src/components/images/QnA-Maker.svg b/extensions/azurePublish/src/components/images/QnA-Maker.svg
index d0f8d7412b..cd0ccb315f 100644
--- a/extensions/azurePublish/src/components/images/QnA-Maker.svg
+++ b/extensions/azurePublish/src/components/images/QnA-Maker.svg
@@ -1,41 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="18" height="18">
-  <defs>
-    <linearGradient
-      id="b5a0d23a-b438-4852-bd15-9183ecab0bb9"
-      x1="-1256.65"
-      y1="18.862"
-      x2="-1256.65"
-      y2="2.992"
-      gradientTransform="matrix(-1, 0, 0, 1, -1244.522, 0)"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop offset="0" stop-color="#32bedd" />
-      <stop offset="1" stop-color="#50e6ff" />
-    </linearGradient>
-    <linearGradient
-      id="a5982f7b-27cd-4886-b2b5-0ab068af2a5a"
-      x1="5.872"
-      y1="-0.862"
-      x2="5.872"
-      y2="15.008"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop offset="0" stop-color="#5ea0ef" />
-      <stop offset="1" stop-color="#0078d4" />
-    </linearGradient>
-  </defs>
-  <g id="ada73254-6c41-4f96-9619-522b0c1453ee">
-    <path
-      d="M7.106,7.019H17.15a.659.659,0,0,1,.659.658v7.981a.66.66,0,0,1-.659.658H13.04a.109.109,0,0,0-.067.023l-2.108,1.615a.219.219,0,0,1-.353-.174V16.426a.11.11,0,0,0-.109-.11h-3.3a.659.659,0,0,1-.658-.658V7.677A.66.66,0,0,1,7.106,7.019Z"
-      fill="url(#b5a0d23a-b438-4852-bd15-9183ecab0bb9)"
-    />
-    <path
-      d="M11.552.659v7.98a.659.659,0,0,1-.658.658H7.6a.11.11,0,0,0-.109.11v1.355a.22.22,0,0,1-.353.174L5.027,9.32A.109.109,0,0,0,4.96,9.3H.85a.66.66,0,0,1-.659-.658V.659A.659.659,0,0,1,.85,0H10.894A.66.66,0,0,1,11.552.659Z"
-      fill="url(#a5982f7b-27cd-4886-b2b5-0ab068af2a5a)"
-    />
-    <path
-      d="M5.165,6.052A1.72,1.72,0,0,1,5.1,5.771a1.916,1.916,0,0,1-.031-.342,1.072,1.072,0,0,1,.106-.478,2,2,0,0,1,.264-.4,4.415,4.415,0,0,1,.341-.359c.123-.115.237-.228.342-.337a1.879,1.879,0,0,0,.264-.346.782.782,0,0,0,.106-.4.707.707,0,0,0-.078-.339A.7.7,0,0,0,6.2,2.531a.977.977,0,0,0-.311-.145,1.414,1.414,0,0,0-.374-.047,1.742,1.742,0,0,0-1.228.574v-1A2.868,2.868,0,0,1,5.753,1.5a2.331,2.331,0,0,1,.661.091,1.652,1.652,0,0,1,.545.268,1.266,1.266,0,0,1,.367.441,1.337,1.337,0,0,1,.134.613,1.479,1.479,0,0,1-.112.593,2.192,2.192,0,0,1-.283.477A2.665,2.665,0,0,1,6.7,4.37c-.131.112-.253.225-.367.337a1.915,1.915,0,0,0-.283.35.748.748,0,0,0-.113.4,1.106,1.106,0,0,0,.048.337,2.109,2.109,0,0,0,.095.256ZM5.658,7.88a.637.637,0,0,1-.437-.169.526.526,0,0,1-.182-.406A.517.517,0,0,1,5.221,6.9a.632.632,0,0,1,.869,0,.516.516,0,0,1,.181.406.525.525,0,0,1-.181.406A.632.632,0,0,1,5.658,7.88Z"
-      fill="#fff"
-    />
-  </g>
-</svg>;
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="18" height="18"><defs><linearGradient id="b5a0d23a-b438-4852-bd15-9183ecab0bb9" x1="-1256.65" y1="18.862" x2="-1256.65" y2="2.992" gradientTransform="matrix(-1, 0, 0, 1, -1244.522, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#32bedd" /><stop offset="1" stop-color="#50e6ff" /></linearGradient><linearGradient id="a5982f7b-27cd-4886-b2b5-0ab068af2a5a" x1="5.872" y1="-0.862" x2="5.872" y2="15.008" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ea0ef" /><stop offset="1" stop-color="#0078d4" /></linearGradient></defs><g id="ada73254-6c41-4f96-9619-522b0c1453ee"><path d="M7.106,7.019H17.15a.659.659,0,0,1,.659.658v7.981a.66.66,0,0,1-.659.658H13.04a.109.109,0,0,0-.067.023l-2.108,1.615a.219.219,0,0,1-.353-.174V16.426a.11.11,0,0,0-.109-.11h-3.3a.659.659,0,0,1-.658-.658V7.677A.66.66,0,0,1,7.106,7.019Z" fill="url(#b5a0d23a-b438-4852-bd15-9183ecab0bb9)"/><path d="M11.552.659v7.98a.659.659,0,0,1-.658.658H7.6a.11.11,0,0,0-.109.11v1.355a.22.22,0,0,1-.353.174L5.027,9.32A.109.109,0,0,0,4.96,9.3H.85a.66.66,0,0,1-.659-.658V.659A.659.659,0,0,1,.85,0H10.894A.66.66,0,0,1,11.552.659Z" fill="url(#a5982f7b-27cd-4886-b2b5-0ab068af2a5a)"/><path d="M5.165,6.052A1.72,1.72,0,0,1,5.1,5.771a1.916,1.916,0,0,1-.031-.342,1.072,1.072,0,0,1,.106-.478,2,2,0,0,1,.264-.4,4.415,4.415,0,0,1,.341-.359c.123-.115.237-.228.342-.337a1.879,1.879,0,0,0,.264-.346.782.782,0,0,0,.106-.4.707.707,0,0,0-.078-.339A.7.7,0,0,0,6.2,2.531a.977.977,0,0,0-.311-.145,1.414,1.414,0,0,0-.374-.047,1.742,1.742,0,0,0-1.228.574v-1A2.868,2.868,0,0,1,5.753,1.5a2.331,2.331,0,0,1,.661.091,1.652,1.652,0,0,1,.545.268,1.266,1.266,0,0,1,.367.441,1.337,1.337,0,0,1,.134.613,1.479,1.479,0,0,1-.112.593,2.192,2.192,0,0,1-.283.477A2.665,2.665,0,0,1,6.7,4.37c-.131.112-.253.225-.367.337a1.915,1.915,0,0,0-.283.35.748.748,0,0,0-.113.4,1.106,1.106,0,0,0,.048.337,2.109,2.109,0,0,0,.095.256ZM5.658,7.88a.637.637,0,0,1-.437-.169.526.526,0,0,1-.182-.406A.517.517,0,0,1,5.221,6.9a.632.632,0,0,1,.869,0,.516.516,0,0,1,.181.406.525.525,0,0,1-.181.406A.632.632,0,0,1,5.658,7.88Z" fill="#fff"/></g></svg>
\ No newline at end of file