Various bug fixes & improvements (#644)

ohltyler · web-flow · commit 3e2f1535fcbd · 2025-02-26T11:43:22.000-08:00
Signed-off-by: Tyler Ohlsen &lt;ohltyler@amazon.com&gt;
diff --git a/common/interfaces.ts b/common/interfaces.ts
@@ -27,6 +27,7 @@ export type MDSQueryParams = {
 
 export type ConfigFieldType =
   | 'string'
+  | 'textArea'
   | 'json'
   | 'jsonArray'
   | 'jsonString'
diff --git a/public/app.tsx b/public/app.tsx
@@ -29,7 +29,6 @@ interface Props extends RouteComponentProps {
 export const FlowFrameworkDashboardsApp = (props: Props) => {
   const { setHeaderActionMenu } = props;
 
-
   // Render the application DOM.
   return (
     <EuiFlexGroup
diff --git a/public/configs/ingest_processors/copy_ingest_processor.ts b/public/configs/ingest_processors/copy_ingest_processor.ts
@@ -49,7 +49,7 @@ export class CopyIngestProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/ingest_processors/text_chunking_ingest_processor.ts b/public/configs/ingest_processors/text_chunking_ingest_processor.ts
@@ -64,7 +64,7 @@ export class TextChunkingIngestProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/ingest_processors/text_embedding_ingest_processor.ts b/public/configs/ingest_processors/text_embedding_ingest_processor.ts
@@ -21,7 +21,7 @@ export class TextEmbeddingIngestProcessor extends Processor {
     this.optionalFields = [
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/ingest_processors/text_image_embedding_ingest_processor.ts b/public/configs/ingest_processors/text_image_embedding_ingest_processor.ts
@@ -25,7 +25,7 @@ export class TextImageEmbeddingIngestProcessor extends Processor {
     this.optionalFields = [
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/ml_processor.ts b/public/configs/ml_processor.ts
@@ -60,7 +60,7 @@ export abstract class MLProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
     ];
   }
diff --git a/public/configs/search_response_processors/collapse_processor.ts b/public/configs/search_response_processors/collapse_processor.ts
@@ -33,7 +33,7 @@ export class CollapseProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'ignore_failure',
diff --git a/public/configs/search_response_processors/normalization_processor.ts b/public/configs/search_response_processors/normalization_processor.ts
@@ -21,20 +21,23 @@ export class NormalizationProcessor extends Processor {
       {
         id: 'weights',
         type: 'string',
+        value: '0.5, 0.5',
       },
       {
         id: 'normalization_technique',
         type: 'select',
         selectOptions: ['min_max', 'l2'],
+        value: 'min_max',
       },
       {
         id: 'combination_technique',
         type: 'select',
         selectOptions: ['arithmetic_mean', 'geometric_mean', 'harmonic_mean'],
+        value: 'arithmetic_mean',
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/search_response_processors/rerank_processor.ts b/public/configs/search_response_processors/rerank_processor.ts
@@ -41,7 +41,7 @@ export class RerankProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'ignore_failure',
diff --git a/public/configs/sort_processor.ts b/public/configs/sort_processor.ts
@@ -34,7 +34,7 @@ export abstract class SortProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/configs/split_processor.ts b/public/configs/split_processor.ts
@@ -39,7 +39,7 @@ export abstract class SplitProcessor extends Processor {
       },
       {
         id: 'description',
-        type: 'string',
+        type: 'textArea',
       },
       {
         id: 'tag',
diff --git a/public/pages/workflow_detail/components/header.tsx b/public/pages/workflow_detail/components/header.tsx
@@ -4,7 +4,6 @@
  */
 
 import React, { useEffect, useState, ReactElement } from 'react';
-import { useHistory } from 'react-router-dom';
 import {
   EuiPageHeader,
   EuiFlexGroup,
@@ -29,10 +28,10 @@ import {
 import {
   APP_PATH,
   USE_NEW_HOME_PAGE,
-  constructUrlWithParams,
   getDataSourceId,
   dataSourceFilterFn,
   formikToUiConfig,
+  constructHrefWithDataSourceId,
 } from '../../../utils';
 import { ExportModal } from './export_modal';
 import {
@@ -70,11 +69,11 @@ interface WorkflowDetailHeaderProps {
   unsavedSearchProcessors: boolean;
   setUnsavedSearchProcessors: (unsavedSearchProcessors: boolean) => void;
   setActionMenu: (menuMount?: MountPoint) => void;
+  setBlockNavigation: (blockNavigation: boolean) => void;
 }
 
 export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
   const dispatch = useAppDispatch();
-  const history = useHistory();
   const { resetForm, setTouched, values, touched, dirty } = useFormikContext<
     WorkflowFormValues
   >();
@@ -116,12 +115,6 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
     };
   }, [setHeaderVariant, USE_NEW_HOME_PAGE]);
 
-  const onExitButtonClick = () => {
-    history.replace(
-      constructUrlWithParams(APP_PATH.WORKFLOWS, undefined, dataSourceId)
-    );
-  };
-
   // get & render the data source component, if applicable
   let DataSourceComponent: ReactElement | null = null;
   if (dataSourceEnabled && getDataSourceManagementPlugin() && dataSourceId) {
@@ -200,21 +193,8 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
       ? ingestSaveButtonDisabled
       : searchSaveButtonDisabled;
 
-  // Add warning when exiting with unsaved changes
-  function alertFn(e: BeforeUnloadEvent) {
-    e.preventDefault();
-  }
-
-  // Hook for warning of unsaved changes if a browser refresh is detected
   useEffect(() => {
-    if (!saveDisabled) {
-      window.addEventListener('beforeunload', alertFn);
-    } else {
-      window.removeEventListener('beforeunload', alertFn);
-    }
-    return () => {
-      window.removeEventListener('beforeunload', alertFn);
-    };
+    props.setBlockNavigation(!saveDisabled);
   }, [saveDisabled]);
 
   // Utility fn to update the workflow UI config only, based on the current form values.
@@ -319,7 +299,10 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
                 iconType: 'exit',
                 tooltip: 'Return to projects',
                 ariaLabel: 'Exit',
-                run: onExitButtonClick,
+                href: constructHrefWithDataSourceId(
+                  APP_PATH.WORKFLOWS,
+                  dataSourceId
+                ),
                 controlType: 'icon',
               } as TopNavMenuIconData,
               {
@@ -407,15 +390,10 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
                 Export
               </EuiSmallButton>,
               <EuiSmallButtonEmpty
-                onClick={() => {
-                  history.replace(
-                    constructUrlWithParams(
-                      APP_PATH.WORKFLOWS,
-                      undefined,
-                      dataSourceId
-                    )
-                  );
-                }}
+                href={constructHrefWithDataSourceId(
+                  APP_PATH.WORKFLOWS,
+                  dataSourceId
+                )}
                 data-testid="closeButton"
               >
                 Close
@@ -430,6 +408,7 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
                 {`Save`}
               </EuiSmallButtonEmpty>,
               <EuiSmallButtonIcon
+                data-testid="undoButton"
                 iconType="editorUndo"
                 aria-label="undo changes"
                 isDisabled={undoDisabled}
diff --git a/public/pages/workflow_detail/workflow_detail.test.tsx b/public/pages/workflow_detail/workflow_detail.test.tsx
@@ -149,19 +149,6 @@ describe('WorkflowDetail Page Functionality (Custom Workflow)', () => {
       );
     });
   });
-
-  test('tests navigation to workflows list on Close button click', async () => {
-    const { getByTestId, history } = renderWithRouter(
-      workflowId,
-      workflowName,
-      WORKFLOW_TYPE.CUSTOM
-    );
-    // The WorkflowDetail Page Close button should navigate back to the workflows list
-    userEvent.click(getByTestId('closeButton'));
-    await waitFor(() => {
-      expect(history.location.pathname).toBe('/workflows');
-    });
-  });
 });
 
 describe('WorkflowDetail Page with skip ingestion option (Hybrid Search Workflow)', () => {
diff --git a/public/pages/workflow_detail/workflow_detail.tsx b/public/pages/workflow_detail/workflow_detail.tsx
diff --git a/public/pages/workflow_detail/workflow_inputs/config_field_list.tsx b/public/pages/workflow_detail/workflow_inputs/config_field_list.tsx
diff --git a/public/pages/workflow_detail/workflow_inputs/processor_inputs/normalization_processor_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/processor_inputs/normalization_processor_inputs.tsx
diff --git a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
diff --git a/public/pages/workflows/new_workflow/utils.ts b/public/pages/workflows/new_workflow/utils.ts
diff --git a/public/utils/config_to_form_utils.ts b/public/utils/config_to_form_utils.ts
diff --git a/public/utils/config_to_schema_utils.ts b/public/utils/config_to_schema_utils.ts

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export class CopyIngestProcessor extends Processor {`
`49`	`49`	`},`
`50`	`50`	`{`
`51`	`51`	`id: 'description',`
`52`		`- type: 'string',`
	`52`	`+ type: 'textArea',`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class TextChunkingIngestProcessor extends Processor {`
`64`	`64`	`},`
`65`	`65`	`{`
`66`	`66`	`id: 'description',`
`67`		`- type: 'string',`
	`67`	`+ type: 'textArea',`
`68`	`68`	`},`
`69`	`69`	`{`
`70`	`70`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class TextEmbeddingIngestProcessor extends Processor {`
`21`	`21`	`this.optionalFields = [`
`22`	`22`	`{`
`23`	`23`	`id: 'description',`
`24`		`- type: 'string',`
	`24`	`+ type: 'textArea',`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class TextImageEmbeddingIngestProcessor extends Processor {`
`25`	`25`	`this.optionalFields = [`
`26`	`26`	`{`
`27`	`27`	`id: 'description',`
`28`		`- type: 'string',`
	`28`	`+ type: 'textArea',`
`29`	`29`	`},`
`30`	`30`	`{`
`31`	`31`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export abstract class MLProcessor extends Processor {`
`60`	`60`	`},`
`61`	`61`	`{`
`62`	`62`	`id: 'description',`
`63`		`- type: 'string',`
	`63`	`+ type: 'textArea',`
`64`	`64`	`},`
`65`	`65`	`];`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export class CollapseProcessor extends Processor {`
`33`	`33`	`},`
`34`	`34`	`{`
`35`	`35`	`id: 'description',`
`36`		`- type: 'string',`
	`36`	`+ type: 'textArea',`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`id: 'ignore_failure',`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,23 @@ export class NormalizationProcessor extends Processor {`
`21`	`21`	`{`
`22`	`22`	`id: 'weights',`
`23`	`23`	`type: 'string',`
	`24`	`+ value: '0.5, 0.5',`
`24`	`25`	`},`
`25`	`26`	`{`
`26`	`27`	`id: 'normalization_technique',`
`27`	`28`	`type: 'select',`
`28`	`29`	`selectOptions: ['min_max', 'l2'],`
	`30`	`+ value: 'min_max',`
`29`	`31`	`},`
`30`	`32`	`{`
`31`	`33`	`id: 'combination_technique',`
`32`	`34`	`type: 'select',`
`33`	`35`	`selectOptions: ['arithmetic_mean', 'geometric_mean', 'harmonic_mean'],`
	`36`	`+ value: 'arithmetic_mean',`
`34`	`37`	`},`
`35`	`38`	`{`
`36`	`39`	`id: 'description',`
`37`		`- type: 'string',`
	`40`	`+ type: 'textArea',`
`38`	`41`	`},`
`39`	`42`	`{`
`40`	`43`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export class RerankProcessor extends Processor {`
`41`	`41`	`},`
`42`	`42`	`{`
`43`	`43`	`id: 'description',`
`44`		`- type: 'string',`
	`44`	`+ type: 'textArea',`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`id: 'ignore_failure',`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export abstract class SortProcessor extends Processor {`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`id: 'description',`
`37`		`- type: 'string',`
	`37`	`+ type: 'textArea',`
`38`	`38`	`},`
`39`	`39`	`{`
`40`	`40`	`id: 'tag',`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export abstract class SplitProcessor extends Processor {`
`39`	`39`	`},`
`40`	`40`	`{`
`41`	`41`	`id: 'description',`
`42`		`- type: 'string',`
	`42`	`+ type: 'textArea',`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`id: 'tag',`