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: runtime dropdown regression in creation flow #7228

Merged
merged 4 commits into from
Apr 21, 2021
Merged

fix: runtime dropdown regression in creation flow #7228

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4c0d0c
Fix conditional rendering of runtime dropdown
pavolum Apr 21, 2021
976114b
Merge branch 'main' into pavolum/bugBashFixes
pavolum Apr 21, 2021
dcbc1d0
Merge branch 'main' into pavolum/bugBashFixes
cwhitten Apr 21, 2021
62a2b09
Merge branch 'main' into pavolum/bugBashFixes
cwhitten Apr 21, 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
5 changes: 1 addition & 4 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 @@ -337,9 +337,7 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
);
}, [focusedStorageFolder]);
const dialogCopy = isImported ? DialogCreationCopy.IMPORT_BOT_PROJECT : DialogCreationCopy.DEFINE_BOT_PROJECT;

return (
// TODO remove runtime language drop down prior to merging as that data is indicated by the tab chosen
<Fragment>
<DialogWrapper isOpen {...dialogCopy} dialogType={DialogTypes.CreateFlow} onDismiss={onDismiss}>
<form onSubmit={handleSubmit}>
Expand All @@ -359,7 +357,6 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
</StackItem>
<StackItem grow={0} styles={halfstack}>
<TextField
multiline
label={formatMessage('Description')}
resizable={false}
styles={description}
Expand All @@ -368,7 +365,7 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
/>
</StackItem>
</Stack>
{!isImported ?? (
{!isImported && (
<Stack horizontal styles={stackinput} tokens={{ childrenGap: '2rem' }}>
<StackItem grow={0} styles={halfstack}>
<Dropdown
Expand Down