Merge pull request #107 from cloudera/minor-ui-issues-final

Fix for Display output for Success View

Author: vkeivan

app/client/src/pages/DataGenerator/Configure.tsx

@@ -266,9 +266,9 @@ const Configure: FunctionComponent = () => {
                  <UseCaseSelector form={form} hidden={formData?.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION} />
 
                 {(
-                    formData?.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION || 
-                    (formData?.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION &&
-                    formData?.use_case === 'custom'))  && 
+                    (formData?.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION || 
+                    formData?.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION) &&
+                    formData?.use_case === 'custom')  && 
                     <Form.Item
                     noStyle
                     shouldUpdate={(prevValues, currentValues) =>
@@ -285,7 +285,7 @@ const Configure: FunctionComponent = () => {
 
                 <Form.Item
                     name='doc_paths'
-                    label={(useCase === 'custom' && formData?.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION)  ? 'Context' : 'Input File'}
+                    label={'Context'}
                     labelCol={labelCol}
                     dependencies={['workflow_type', 'use_case]']}
                     shouldUpdate

app/client/src/pages/DataGenerator/Finish.tsx

@@ -202,8 +202,8 @@ const Finish = () => {
     }
 
     let topicTabs = [];
-    console.log('Preparing topics...', formValues.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION)
-    if (!hasDocSeeds && formValues.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION && formValues.use_case !== 'custom' && 
+    console.log('Preparing topics...', formValues.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION)
+    if (!hasDocSeeds && formValues.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION && formValues.use_case !== 'custom' && 
         hasTopics(genDatasetResp) && !isEmpty(genDatasetResp?.results)) {
             const values = Object.values(genDatasetResp?.results);
 
@@ -301,7 +301,8 @@ const Finish = () => {
     console.log('Finish >> ');
     console.log('hasTopics', hasTopics(genDatasetResp));
     console.log('formValues', formValues);
-    console.log('isDemo', isDemo, topicTabs);
+    console.log('isDemo', isDemo);
+    console.log('topicTabs', topicTabs);
 
     return (
         <div>
@@ -327,7 +328,7 @@ const Finish = () => {
                     </StyledButton>
                 </Flex>
             )}
-            {(isDemo && formValues.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION && formValues.use_case !== 'custom' && hasTopics(genDatasetResp) && !hasDocSeeds) && (
+            {(isDemo && formValues.workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION && formValues.use_case !== 'custom' && hasTopics(genDatasetResp) && !hasDocSeeds) && (
                 <TabsContainer title={'Generated Dataset'}>
                     <Tabs tabPosition='left' items={topicTabs}/>
                 </TabsContainer>

app/client/src/pages/DataGenerator/Prompt.tsx

@@ -107,7 +107,8 @@ const Prompt = () => {
         doc_paths,
         input_key,
         input_value,
-        output_key
+        output_key,
+        useCase
     );
 
     console.log('values', form.getFieldsValue(true));
@@ -301,7 +302,7 @@ const Prompt = () => {
 
                     </div>
                     {((workflow_type === WorkflowType.CUSTOM_DATA_GENERATION && !isEmpty(doc_paths)) ||
-                    (workflow_type === WorkflowType.SUPERVISED_FINE_TUNING && !isEmpty(doc_paths))) && 
+                    (workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION && !isEmpty(doc_paths))) && 
                         <StyledFormItem
                             name={'num_questions'}
                             label={

app/client/src/pages/DataGenerator/hooks.ts

@@ -211,9 +211,11 @@ export const useDatasetSize = (
     doc_paths: string[],
     input_key: string,
     input_value: string,
-    output_key: string
+    output_key: string,
+    use_case: string
  ) => {
-    if (workflow_type !== WorkflowType.CUSTOM_DATA_GENERATION && isEmpty(doc_paths)) {
+    if ((workflow_type === WorkflowType.CUSTOM_DATA_GENERATION && use_case === 'custom' && isEmpty(doc_paths))
+    || workflow_type === WorkflowType.FREE_FORM_DATA_GENERATION) {
         return {
           data: 0
         }