From a98200165458e5b6ca8a2470716fbecc8e56d1fe Mon Sep 17 00:00:00 2001
From: TJ Durnford <tjdford@gmail.com>
Date: Fri, 6 Mar 2020 19:18:43 -0800
Subject: [PATCH] fix: Moved value field to user tab and removed inline lu from
 attachment input (#2194)

---
 .../src/Form/fields/PromptField/Other.tsx     | 14 +------------
 .../src/Form/fields/PromptField/UserInput.tsx | 21 ++++++++++++++-----
 .../src/Form/widgets/LuEditorWidget.tsx       |  5 ++++-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/Other.tsx b/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/Other.tsx
index 2e36c41bb7..581957d1c4 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/Other.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/Other.tsx
@@ -10,7 +10,6 @@ import { MicrosoftInputDialog } from '@bfc/shared';
 
 import { WidgetLabel } from '../../widgets/WidgetLabel';
 import { LgEditorWidget } from '../../widgets/LgEditorWidget';
-import { TextWidget } from '../../widgets';
 
 import { Validations } from './Validations';
 import { field } from './styles';
@@ -22,7 +21,7 @@ interface OtherProps extends FieldProps<MicrosoftInputDialog> {
 }
 
 export const Other: React.FC<OtherProps> = props => {
-  const { onChange, getSchema, idSchema, formData, errorSchema } = props;
+  const { onChange, getSchema, idSchema, formData } = props;
 
   return (
     <React.Fragment>
@@ -56,17 +55,6 @@ export const Other: React.FC<OtherProps> = props => {
           height={125}
         />
       </div>
-      <div css={field}>
-        <TextWidget
-          onChange={onChange('value')}
-          schema={getSchema('value')}
-          id={idSchema.value.__id}
-          value={formData.value}
-          label={formatMessage('Value')}
-          formContext={props.formContext}
-          rawErrors={errorSchema.value && errorSchema.value.__errors}
-        />
-      </div>
       <div css={field}>
         <WidgetLabel
           label={formatMessage('Default value response')}
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/UserInput.tsx b/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/UserInput.tsx
index d2550e546d..8a83eb5dda 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/UserInput.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/UserInput.tsx
@@ -43,11 +43,6 @@ export const UserInput: React.FC<UserInputProps> = props => {
 
   return (
     <Fragment>
-      {usesLuisRecognizer(formContext.currentDialog) && (
-        <div css={field}>
-          <LuEditorWidget name={intentName} formContext={formContext} />
-        </div>
-      )}
       <div css={field}>
         <TextWidget
           onChange={onChange('property')}
@@ -72,6 +67,22 @@ export const UserInput: React.FC<UserInputProps> = props => {
           />
         </div>
       )}
+      <div css={field}>
+        <TextWidget
+          onChange={onChange('value')}
+          schema={getSchema('value')}
+          id={idSchema.value.__id}
+          value={formData.value}
+          label={formatMessage('Value')}
+          formContext={props.formContext}
+          rawErrors={errorSchema.value && errorSchema.value.__errors}
+        />
+      </div>
+      {usesLuisRecognizer(formContext.currentDialog) && type !== SDKTypes.AttachmentInput && (
+        <div css={field}>
+          <LuEditorWidget name={intentName} formContext={formContext} prompt />
+        </div>
+      )}
       {getSchema('defaultLocale') && (
         <div css={field}>
           <TextWidget
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LuEditorWidget.tsx b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LuEditorWidget.tsx
index dba358ad9f..658419708e 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LuEditorWidget.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LuEditorWidget.tsx
@@ -17,6 +17,7 @@ interface LuEditorWidgetProps {
   name: string;
   height?: number | string;
   onChange?: (template?: string) => void;
+  prompt?: boolean;
 }
 
 export class LuEditorWidget extends React.Component<LuEditorWidgetProps> {
@@ -83,7 +84,9 @@ export class LuEditorWidget extends React.Component<LuEditorWidgetProps> {
       ? diagnostic.message.split('error message: ')[diagnostic.message.split('error message: ').length - 1]
       : '';
 
-    const label = formatMessage('Trigger phrases (intent: #{name})', { name });
+    const label = prompt
+      ? formatMessage('Expected responses (intent: {name})', { name })
+      : formatMessage('Trigger phrases (intent: {name})', { name });
 
     return (
       <>