Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pva deep link in new creation #7100

Merged
merged 4 commits into from
Apr 19, 2021
Merged

fix: pva deep link in new creation #7100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a27cacb
removing unused commented code
pavolum Apr 19, 2021
6230d74
supporting client routing to defineConversation for PVA scenarios
pavolum Apr 19, 2021
472c2a1
Ensuring runtimeType does not render as a creation dropdown for PVA s…
pavolum Apr 19, 2021
85f0e16
Merge branch 'main' into pavolum/fixPvaDeepLink
cwhitten Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 13 additions & 11 deletions Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
Expand Down
1 change: 0 additions & 1 deletion Composer/packages/client/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down