feat: enable new creation flow as default

Composer/packages/client/__tests__/components/CreationFlowV2/index.test.tsx

@@ -94,6 +94,7 @@ describe('<CreationFlowV2/>', () => {
       eTag: undefined,
       preserveRoot: undefined,
       qnqKbUrls: undefined,
+      runtimeChoice: 'azureWebApp',
       templateDir: undefined,
       urlSuffix: undefined,
     });

Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx

@@ -116,6 +116,7 @@ const CreationFlowV2: React.FC<CreationFlowProps> = () => {
       description: formData.description,
       location: formData.location,
       schemaUrl: formData.schemaUrl,
+      runtimeChoice: formData.runtimeChoice,
       appLocale,
       qnaKbUrls,
       templateDir: formData?.pvaData?.templateDir,

Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx

@@ -17,6 +17,7 @@ import { DialogWrapper, DialogTypes } from '@bfc/ui-shared';
 import { useRecoilValue } from 'recoil';
 import { Dropdown } from 'office-ui-fabric-react/lib/Dropdown';
 import { QnABotTemplateId } from '@bfc/shared';
+import { RuntimeType, webAppRuntimeKey } from '@bfc/shared';
 
 import {
   DialogCreationCopy,
@@ -25,7 +26,6 @@ import {
   mockLanguageOptions,
   runtimeOptions,
   defaultPrimaryLanguage,
-  defaultRuntime,
 } from '../../../constants';
 import { FieldConfig, useForm } from '../../../hooks/useForm';
 import { StorageFolder } from '../../../recoilModel/types';
@@ -79,7 +79,7 @@ type DefineConversationFormData = {
   description: string;
   schemaUrl: string;
   primaryLanguage: string;
-  runtimeChoice: string;
+  runtimeChoice: RuntimeType;
   location?: string;
   templateVersion?: string;
 
@@ -202,7 +202,7 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
     const formData: DefineConversationFormData = {
       name: getDefaultName(),
       primaryLanguage: defaultPrimaryLanguage,
-      runtimeChoice: defaultRuntime,
+      runtimeChoice: webAppRuntimeKey,
       description: '',
       schemaUrl: '',
       location:

Composer/packages/client/src/constants.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FeedName } from '@botframework-composer/types/src';
+import { FeedName, webAppRuntimeKey, functionsRuntimeKey } from '@botframework-composer/types/src';
 import formatMessage from 'format-message';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 
@@ -406,6 +406,6 @@ export const mockLanguageOptions: IDropdownOption[] = [
 export const defaultRuntime = 'azureWebApp';
 
 export const runtimeOptions: IDropdownOption[] = [
-  { key: defaultRuntime, text: 'Azure Web App' },
-  { key: 'azureFunctions', text: 'Azure Functions' },
+  { key: webAppRuntimeKey, text: 'Azure Web App' },
+  { key: functionsRuntimeKey, text: 'Azure Functions' },
 ];

Composer/packages/client/src/recoilModel/dispatchers/project.ts

@@ -343,6 +343,7 @@ export const projectDispatcher = () => {
         urlSuffix,
         alias,
         preserveRoot,
+        runtimeChoice,
       } = newProjectData;
       // starts the creation process and stores the jobID in state for tracking
       const response = await createNewBotFromTemplateV2(
@@ -352,6 +353,7 @@ export const projectDispatcher = () => {
         name,
         description,
         location,
+        runtimeChoice,
         schemaUrl,
         locale,
         templateDir,

Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts

@@ -21,6 +21,7 @@ import {
   RootBotManagedProperties,
   defaultPublishConfig,
   LgFile,
+  RuntimeType,
   QnABotTemplateId,
 } from '@bfc/shared';
 import formatMessage from 'format-message';
@@ -554,6 +555,7 @@ export const createNewBotFromTemplateV2 = async (
   name: string,
   description: string,
   location: string,
+  runtimeChoice: RuntimeType,
   schemaUrl?: string,
   locale?: string,
   templateDir?: string,
@@ -574,6 +576,7 @@ export const createNewBotFromTemplateV2 = async (
     eTag,
     alias,
     preserveRoot,
+    runtimeChoice,
   });
   return jobId;
 };

Composer/packages/server/src/models/asset/__tests__/assetManager.test.ts

@@ -158,7 +158,8 @@ describe('assetManager', () => {
         'generator-conversational-core',
         '1.0.3',
         'sampleConversationalCore',
-        mockLocRef
+        mockLocRef,
+        'azureWebApp'
       );
       expect(newBotLocationRef).toStrictEqual({
         path: '/path/to/npmbot/sampleConversationalCore',

Composer/packages/server/src/models/asset/assetManager.ts

@@ -5,7 +5,7 @@ import fs from 'fs';
 import path from 'path';
 
 import find from 'lodash/find';
-import { UserIdentity, FileExtensions, BotTemplateV2, FeedType } from '@bfc/extension';
+import { UserIdentity, FileExtensions, BotTemplateV2, FeedType, RuntimeType } from '@bfc/extension';
 import { mkdirSync, readFile } from 'fs-extra';
 import yeoman from 'yeoman-environment';
 import Environment from 'yeoman-environment';
@@ -103,6 +103,7 @@ export class AssetManager {
     templateVersion: string,
     projectName: string,
     ref: LocationRef,
+    runtimeChoice: RuntimeType,
     user?: UserIdentity
   ): Promise<LocationRef> {
     try {
@@ -124,7 +125,7 @@ export class AssetManager {
       const remoteTemplateAvailable = await this.installRemoteTemplate(generatorName, npmPackageName, templateVersion);
 
       if (remoteTemplateAvailable) {
-        await this.instantiateRemoteTemplate(generatorName, dstDir, projectName);
+        await this.instantiateRemoteTemplate(generatorName, dstDir, projectName, runtimeChoice);
       } else {
         throw new Error(`error hit when installing remote template`);
       }
@@ -159,13 +160,14 @@ export class AssetManager {
   private async instantiateRemoteTemplate(
     generatorName: string,
     dstDir: string,
-    projectName: string
+    projectName: string,
+    runtimeChoice: RuntimeType
   ): Promise<boolean> {
     log('About to instantiate a template!', dstDir, generatorName, projectName);
     this.yeomanEnv.cwd = dstDir;
     process.chdir(dstDir);
 
-    await this.yeomanEnv.run([generatorName, projectName], {}, () => {
+    await this.yeomanEnv.run([generatorName, projectName, runtimeChoice], {}, () => {
       log('Template successfully instantiated', dstDir, generatorName, projectName);
     });
     return true;

Composer/packages/server/src/services/project.ts

@@ -425,6 +425,7 @@ export class BotProjectService {
       alias,
       locale,
       schemaUrl,
+      runtimeChoice,
     } = req.body;
     // get user from request
     const user = await ExtensionContext.getUserFromRequest(req);
@@ -451,6 +452,7 @@ export class BotProjectService {
             templateVersion,
             name,
             locationRef,
+            runtimeChoice,
             user
           );
 

Composer/packages/types/src/creation.ts

@@ -22,3 +22,8 @@ export const nodeFeedKey = 'firstPartyNode';
 export const defaultFeeds = [nodeFeedKey, csharpFeedKey] as const;
 export type FeedName = typeof defaultFeeds[number];
 export type FeedType = 'npm' | 'nuget';
+
+export const webAppRuntimeKey = 'azureWebApp';
+export const functionsRuntimeKey = 'azureFunctions';
+export const availableRunTimes = [webAppRuntimeKey, functionsRuntimeKey] as const;
+export type RuntimeType = typeof availableRunTimes[number];