fix: pva deep link in new creation (#7100)

* removing unused commented code * supporting client routing to defineConversation for PVA scenarios * Ensuring runtimeType does not render as a creation dropdown for PVA scenarios Co-authored-by: Chris Whitten <[email protected]>
microsoft · Apr 19, 2021 · c0ffaf0 · c0ffaf0
1 parent 20ef5de
commit c0ffaf0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx b/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
@@ -184,6 +184,15 @@ const CreationFlowV2: React.FC<CreationFlowProps> = () => {
           onDismiss={handleDismiss}
           onSubmit={handleSubmit}
         />
+        <DefineConversationV2
+          createFolder={createFolder}
+          focusedStorageFolder={focusedStorageFolder}
+          path="create/:templateId"
+          updateFolder={updateFolder}
+          onCurrentPathUpdate={updateCurrentPath}
+          onDismiss={handleDismiss}
+          onSubmit={handleSubmit}
+        />
         <CreateOptionsV2
           fetchReadMe={fetchReadMe}
           path="create"

diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx
@@ -368,17 +368,19 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
               />
             </StackItem>
           </Stack>
-          <Stack horizontal styles={stackinput} tokens={{ childrenGap: '2rem' }}>
-            <StackItem grow={0} styles={halfstack}>
-              <Dropdown
-                data-testid="NewDialogRuntimeType"
-                label={formatMessage('Runtime type')}
-                options={getSupportedRuntimesForTemplate()}
-                selectedKey={formData.runtimeType}
-                onChange={(_e, option) => updateField('runtimeType', option?.key.toString())}
-              />
-            </StackItem>
-          </Stack>
+          {!isImported ?? (
+            <Stack horizontal styles={stackinput} tokens={{ childrenGap: '2rem' }}>
+              <StackItem grow={0} styles={halfstack}>
+                <Dropdown
+                  data-testid="NewDialogRuntimeType"
+                  label={formatMessage('Runtime type')}
+                  options={getSupportedRuntimesForTemplate()}
+                  selectedKey={formData.runtimeType}
+                  onChange={(_e, option) => updateField('runtimeType', option?.key.toString())}
+                />
+              </StackItem>
+            </Stack>
+          )}
           {locationSelectContent}
           <DialogFooter>
             <DefaultButton text={formatMessage('Cancel')} onClick={onDismiss} />

diff --git a/Composer/packages/client/src/router.tsx b/Composer/packages/client/src/router.tsx
@@ -38,7 +38,6 @@ const BotProjectSettings = React.lazy(() => import('./pages/botProject/BotProjec
 const Diagnostics = React.lazy(() => import('./pages/diagnostics/Diagnostics'));
 const ExtensionsPage = React.lazy(() => import('./pages/extensions/ExtensionsPage'));
 const Publish = React.lazy(() => import('./pages/publish/Publish'));
-// const BotCreationFlowRouter = React.lazy(() => import('./components/CreationFlow/CreationFlow'));
 const BotCreationFlowRouterV2 = React.lazy(() => import('./components/CreationFlow/v2/CreationFlow'));
 const FormDialogPage = React.lazy(() => import('./pages/form-dialog/FormDialogPage'));