Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions src/components/dialogs/commons/prefilled-name-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { useEffect, useState } from 'react';
import { useFormContext } from 'react-hook-form';
import { ElementType, FieldConstants, UniqueNameInput } from '@gridsuite/commons-ui';
import { ElementType, FieldConstants, UniqueNameInput, useSnackMessage } from '@gridsuite/commons-ui';
import { useSelector } from 'react-redux';
import { elementExists, getBaseName } from '../../../utils/rest-api';
import { AppState } from '../../../redux/types';
Expand All @@ -23,40 +23,32 @@ export interface PrefilledNameInputProps {
* Used for CreateCaseDialog and CreateStudyDialog
*/
export default function PrefilledNameInput({ label, name, elementType }: Readonly<PrefilledNameInputProps>) {
const {
setValue,
clearErrors,
watch,
formState: { errors },
} = useFormContext();
const { setValue, watch } = useFormContext();

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

const caseFile = watch(FieldConstants.CASE_FILE) as File;
const caseFileErrorMessage = errors.caseFile?.message;
const apiCallErrorMessage = errors.root?.apiCall?.message;

const activeDirectory = useSelector((state: AppState) => state.activeDirectory);

useEffect(() => {
// we replace the name only if some conditions are respected
if (caseFile && !modifiedByUser && !apiCallErrorMessage && !caseFileErrorMessage) {
if (caseFile && !modifiedByUser) {
const { name: caseName } = caseFile;

if (caseName) {
clearErrors(name);
getBaseName(caseName)
.then((response) => {
setValue(name, response, {
shouldDirty: true,
});
})
.catch((error) => {
console.error('Error fetching base name:', error);
snackError({
messageTxt: error.message,
});
});
}
}
}, [caseFile, modifiedByUser, apiCallErrorMessage, caseFileErrorMessage, setValue, clearErrors, name]);
}, [caseFile, modifiedByUser, setValue, name, snackError]);

return (
<UniqueNameInput
Expand Down
17 changes: 1 addition & 16 deletions src/components/dialogs/commons/upload-new-case.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function UploadNewCase({
name: FieldConstants.CASE_UUID,
});

const { clearErrors, setError, getValues, setValue } = useFormContext();
const { clearErrors, setError, getValues } = useFormContext();

const caseFile = value as File;
const { name: caseFileName } = caseFile || {};
Expand Down Expand Up @@ -72,8 +72,6 @@ export default function UploadNewCase({
if (currentFile.size <= MAX_FILE_SIZE_IN_BYTES) {
onValueChange(currentFile);

const { name: currentCaseFileName } = currentFile;

if (isNewStudyCreation) {
// Create new case
setCaseFileLoading(true);
Expand All @@ -95,19 +93,6 @@ export default function UploadNewCase({
.finally(() => {
setCaseFileLoading(false);
});
} else {
const caseName = getValues(FieldConstants.CASE_NAME);
if (currentCaseFileName && caseName !== currentCaseFileName) {
clearErrors(FieldConstants.CASE_NAME);
setValue(
FieldConstants.CASE_NAME,
currentCaseFileName.substring(0, currentCaseFileName.indexOf('.')),
{
shouldDirty: true,
shouldValidate: true,
}
);
}
}
} else {
setError(FieldConstants.CASE_FILE, {
Expand Down
Loading