Skip to content

Commit 9c39229

Browse files
committed
Add checks in all modals
Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
1 parent 7f8d7fd commit 9c39229

File tree

4 files changed

+30
-3
lines changed

4 files changed

+30
-3
lines changed

public/pages/workflow_detail/workflow_inputs/processor_inputs/ml_processor_inputs/modals/configure_expression_modal.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ import {
5353
injectParameters,
5454
prepareDocsForSimulate,
5555
unwrapTransformedDocs,
56+
useDataSourceVersion,
57+
useMissingDataSourceVersion,
5658
} from '../../../../../../utils';
5759
import { TextField } from '../../../input_fields';
5860
import {
@@ -94,6 +96,11 @@ const MAX_INPUT_DOCS = 10;
9496
export function ConfigureExpressionModal(props: ConfigureExpressionModalProps) {
9597
const dispatch = useAppDispatch();
9698
const dataSourceId = getDataSourceId();
99+
const dataSourceVersion = useDataSourceVersion(dataSourceId);
100+
const missingDataSourceVersion = useMissingDataSourceVersion(
101+
dataSourceId,
102+
dataSourceVersion
103+
);
97104
const { values, setFieldValue, setFieldTouched } = useFormikContext<
98105
WorkflowFormValues
99106
>();
@@ -407,6 +414,8 @@ export function ConfigureExpressionModal(props: ConfigureExpressionModalProps) {
407414
style={{ width: '100px' }}
408415
isLoading={isFetching}
409416
disabled={
417+
(props.context === PROCESSOR_CONTEXT.INGEST &&
418+
missingDataSourceVersion) ||
410419
onIngestAndNoDocs ||
411420
onSearchAndNoQuery ||
412421
!props.isDataFetchingAvailable ||

public/pages/workflow_detail/workflow_inputs/processor_inputs/ml_processor_inputs/modals/configure_multi_expression_modal.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ import {
5151
injectParameters,
5252
prepareDocsForSimulate,
5353
unwrapTransformedDocs,
54+
useDataSourceVersion,
55+
useMissingDataSourceVersion,
5456
} from '../../../../../../utils';
5557
import { TextField } from '../../../input_fields';
5658
import {
@@ -91,6 +93,11 @@ export function ConfigureMultiExpressionModal(
9193
) {
9294
const dispatch = useAppDispatch();
9395
const dataSourceId = getDataSourceId();
96+
const dataSourceVersion = useDataSourceVersion(dataSourceId);
97+
const missingDataSourceVersion = useMissingDataSourceVersion(
98+
dataSourceId,
99+
dataSourceVersion
100+
);
94101
const { values, setFieldValue, setFieldTouched } = useFormikContext<
95102
WorkflowFormValues
96103
>();
@@ -433,6 +440,8 @@ export function ConfigureMultiExpressionModal(
433440
style={{ width: '100px' }}
434441
isLoading={isFetching}
435442
disabled={
443+
(props.context === PROCESSOR_CONTEXT.INGEST &&
444+
missingDataSourceVersion) ||
436445
onIngestAndNoDocs ||
437446
onSearchAndNoQuery ||
438447
!props.isDataFetchingAvailable ||

public/pages/workflow_detail/workflow_inputs/processor_inputs/ml_processor_inputs/modals/configure_template_modal.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ import {
5757
injectParameters,
5858
prepareDocsForSimulate,
5959
unwrapTransformedDocs,
60+
useDataSourceVersion,
61+
useMissingDataSourceVersion,
6062
} from '../../../../../../utils';
6163
import { TextField } from '../../../input_fields';
6264
import {
@@ -102,6 +104,11 @@ const PROMPT_EDITOR_ID = 'promptEditor';
102104
export function ConfigureTemplateModal(props: ConfigureTemplateModalProps) {
103105
const dispatch = useAppDispatch();
104106
const dataSourceId = getDataSourceId();
107+
const dataSourceVersion = useDataSourceVersion(dataSourceId);
108+
const missingDataSourceVersion = useMissingDataSourceVersion(
109+
dataSourceId,
110+
dataSourceVersion
111+
);
105112
const { values, setFieldValue, setFieldTouched } = useFormikContext<
106113
WorkflowFormValues
107114
>();
@@ -638,6 +645,8 @@ export function ConfigureTemplateModal(props: ConfigureTemplateModalProps) {
638645
style={{ width: '100px' }}
639646
isLoading={isFetching}
640647
disabled={
648+
(props.context === PROCESSOR_CONTEXT.INGEST &&
649+
missingDataSourceVersion) ||
641650
onIngestAndNoDocs ||
642651
onSearchAndNoQuery ||
643652
!props.isDataFetchingAvailable ||

public/pages/workflows/new_workflow/quick_configure_modal.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export function QuickConfigureModal(props: QuickConfigureModalProps) {
260260
<EuiFlexGroup direction="column" gutterSize="s">
261261
<EuiFlexItem>
262262
<TextField
263-
label="Name - required"
263+
label="Name"
264264
fullWidth={true}
265265
fieldPath={`name`}
266266
showError={true}
@@ -308,7 +308,7 @@ export function QuickConfigureModal(props: QuickConfigureModalProps) {
308308
modelCategory={MODEL_CATEGORY.LLM}
309309
fieldPath="llm"
310310
showMissingInterfaceCallout={false}
311-
label="Large language model - required"
311+
label="Large language model"
312312
helpText="The large language model to generate user-friendly responses."
313313
fullWidth={true}
314314
showError={true}
@@ -340,7 +340,7 @@ export function QuickConfigureModal(props: QuickConfigureModalProps) {
340340
modelCategory={MODEL_CATEGORY.EMBEDDING}
341341
fieldPath="embeddingModel"
342342
showMissingInterfaceCallout={false}
343-
label="Embedding model - required"
343+
label="Embedding model"
344344
helpText="The model to generate embeddings."
345345
fullWidth={true}
346346
showError={true}

0 commit comments

Comments
 (0)