Skip to content

Commit cc364e6

Browse files
committed
Case import : compute base name from case-server instead of front computation
1 parent c057c95 commit cc364e6

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/components/dialogs/commons/prefilled-name-input.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { useEffect, useState } from 'react';
99
import { useFormContext } from 'react-hook-form';
10-
import { ElementType, FieldConstants, UniqueNameInput } from '@gridsuite/commons-ui';
10+
import { ElementType, FieldConstants, UniqueNameInput, useSnackMessage } from '@gridsuite/commons-ui';
1111
import { useSelector } from 'react-redux';
1212
import { elementExists, getBaseName } from '../../../utils/rest-api';
1313
import { AppState } from '../../../redux/types';
@@ -31,6 +31,7 @@ export default function PrefilledNameInput({ label, name, elementType }: Readonl
3131
} = useFormContext();
3232

3333
const [modifiedByUser, setModifiedByUser] = useState(false);
34+
const { snackError } = useSnackMessage();
3435

3536
const caseFile = watch(FieldConstants.CASE_FILE) as File;
3637
const caseFileErrorMessage = errors.caseFile?.message;
@@ -49,14 +50,17 @@ export default function PrefilledNameInput({ label, name, elementType }: Readonl
4950
.then((response) => {
5051
setValue(name, response, {
5152
shouldDirty: true,
53+
shouldValidate: true,
5254
});
5355
})
5456
.catch((error) => {
55-
console.error('Error fetching base name:', error);
57+
snackError({
58+
messageTxt: error.message,
59+
});
5660
});
5761
}
5862
}
59-
}, [caseFile, modifiedByUser, apiCallErrorMessage, caseFileErrorMessage, setValue, clearErrors, name]);
63+
}, [caseFile, modifiedByUser, apiCallErrorMessage, caseFileErrorMessage, setValue, clearErrors, name, snackError]);
6064

6165
return (
6266
<UniqueNameInput

src/components/dialogs/commons/upload-new-case.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function UploadNewCase({
4343
name: FieldConstants.CASE_UUID,
4444
});
4545

46-
const { clearErrors, setError, getValues, setValue } = useFormContext();
46+
const { clearErrors, setError, getValues } = useFormContext();
4747

4848
const caseFile = value as File;
4949
const { name: caseFileName } = caseFile || {};
@@ -99,14 +99,6 @@ export default function UploadNewCase({
9999
const caseName = getValues(FieldConstants.CASE_NAME);
100100
if (currentCaseFileName && caseName !== currentCaseFileName) {
101101
clearErrors(FieldConstants.CASE_NAME);
102-
setValue(
103-
FieldConstants.CASE_NAME,
104-
currentCaseFileName.substring(0, currentCaseFileName.indexOf('.')),
105-
{
106-
shouldDirty: true,
107-
shouldValidate: true,
108-
}
109-
);
110102
}
111103
}
112104
} else {

0 commit comments

Comments
 (0)