Skip to content

Commit fc06c49

Browse files
authored
Revert last modification on unique-name-validation useEffect (#835)
Signed-off-by: LE SAULNIER Kevin <[email protected]>
1 parent f8e9cef commit fc06c49

File tree

1 file changed

+29
-17
lines changed

1 file changed

+29
-17
lines changed

src/hooks/use-unique-name-validation.ts

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,42 @@ export function useUniqueNameValidation({
8787

8888
// We have to use an useEffect because the name can change from outside of this component (when we upload a case file for instance)
8989
useEffect(() => {
90-
const trimmedValue = value?.trim?.();
91-
if (!trimmedValue && isDirty) {
92-
clearErrors('root.isValidating');
93-
setError(name, {
94-
type: 'validate',
95-
message: 'nameEmpty',
96-
});
97-
return;
90+
const trimmedValue = value.trim();
91+
92+
if (selectedDirectory) {
93+
debouncedHandleCheckName(trimmedValue);
9894
}
9995

100-
if (!isDirty || defaultFieldValue?.trim?.() === trimmedValue) {
96+
// if the name is unchanged, we don't do custom validation
97+
if (!isDirty) {
10198
clearErrors(name);
10299
return;
103100
}
104-
105-
setError('root.isValidating', {
106-
type: 'validate',
107-
message: 'cantSubmitWhileValidating',
108-
});
109-
110-
if (directory) {
101+
if (trimmedValue) {
102+
clearErrors(name);
103+
setError('root.isValidating', {
104+
type: 'validate',
105+
message: 'cantSubmitWhileValidating',
106+
});
111107
debouncedHandleCheckName(trimmedValue);
108+
} else {
109+
clearErrors('root.isValidating');
110+
setError(name, {
111+
type: 'validate',
112+
message: 'nameEmpty',
113+
});
112114
}
113-
}, [value, debouncedHandleCheckName, setError, clearErrors, name, isDirty, defaultFieldValue, directory]);
115+
}, [
116+
value,
117+
debouncedHandleCheckName,
118+
setError,
119+
clearErrors,
120+
name,
121+
isDirty,
122+
defaultFieldValue,
123+
directory,
124+
selectedDirectory,
125+
]);
114126

115127
return {
116128
isValidating,

0 commit comments

Comments
 (0)