Skip to content

Commit f691214

Browse files
committed
feat: disable Trace button properly
fix: trim variant string properly
1 parent 1379392 commit f691214

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

src/pages/filter/dtree/components/query-builder/ui/trace-variant/trace-variant-popover.tsx

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export const TraceVariantPopover: FC<ITraceVariantButtonProps> = observer(
3131
//const [transcript] = useState<string>('') // reserved for future use
3232
const transcript = ''
3333

34+
const dataReady: boolean = !!(
35+
data && data[0].variant.trim() === variant.trim()
36+
)
37+
3438
const point2stepIdx: PointToStepIdx = p => {
3539
const idx = stepStore.steps.findIndex(
3640
step => step.returnPointIndex === p || step.conditionPointIndex === p,
@@ -118,18 +122,17 @@ export const TraceVariantPopover: FC<ITraceVariantButtonProps> = observer(
118122
<Loader size="xs" />
119123
)
120124
}
121-
if (!data || data[0].variant !== variant) {
122-
return null
125+
if (data && dataReady) {
126+
return data[1] === 'Finished' ? (
127+
<TracesResultView
128+
data={data[0]}
129+
point2step={point2step.bind(this)}
130+
selectStep={selectStep.bind(this)}
131+
/>
132+
) : (
133+
<div style={{ color: 'red' }}>{`Error: ${data[0].error}`}</div>
134+
)
123135
}
124-
return data[1] === 'Finished' ? (
125-
<TracesResultView
126-
data={data[0]}
127-
point2step={point2step.bind(this)}
128-
selectStep={selectStep.bind(this)}
129-
/>
130-
) : (
131-
<div style={{ color: 'red' }}>{`Error: ${data[0].error}`}</div>
132-
)
133136
}
134137

135138
return (
@@ -145,11 +148,12 @@ export const TraceVariantPopover: FC<ITraceVariantButtonProps> = observer(
145148
onClose={onClose}
146149
onApply={() => {
147150
setStopped(false)
148-
setVariant(variant.trim())
149-
traceStore.setQuery({ variant, transcript })
151+
const v = variant.trim()
152+
if (v !== variant) setVariant(v)
153+
traceStore.setQuery({ variant: v, transcript })
150154
showHistory(false)
151155
}}
152-
isApplyDisabled={variant.length < 7 || isLoading}
156+
isApplyDisabled={variant.length < 7 || isLoading || dataReady}
153157
isLoading={false}
154158
cancelText={t('dtree.traceVariant.close')}
155159
applyText={t('dtree.traceVariant.go')}

0 commit comments

Comments
 (0)