Skip to content
Open
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
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@gridsuite/commons-ui": "0.136.0",
"@gridsuite/commons-ui": "../commons-ui/gridsuite-commons-ui-0.136.0.tgz",
"@hello-pangea/dnd": "^18.0.1",
"@hookform/resolvers": "^4.1.3",
"@mui/icons-material": "^5.18.0",
Expand Down
27 changes: 6 additions & 21 deletions src/components/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
useNotificationsListener,
useSnackMessage,
getComputedLanguage,
snackWithFallback,
} from '@gridsuite/commons-ui';
import PageNotFound from './page-not-found';
import { FormattedMessage } from 'react-intl';
Expand Down Expand Up @@ -155,12 +156,7 @@ const App = () => {
.then((param) => {
updateParams([param]);
})
.catch((error) =>
snackError({
messageTxt: error.message,
headerId: 'paramsRetrievingError',
})
);
.catch((error) => snackWithFallback(snackError, error, { headerId: 'paramsRetrievingError' }));
}
},
[snackError, updateParams]
Expand Down Expand Up @@ -212,9 +208,7 @@ const App = () => {
dispatch(saveSpreadsheetGlobalFilters(tabUuid, formattedGlobalFilters));
})
.catch((error) => {
console.error(error);
snackError({
messageTxt: error,
snackWithFallback(snackError, error, {
headerId: 'spreadsheet/create_new_spreadsheet/error_loading_model',
});
});
Expand All @@ -230,8 +224,7 @@ const App = () => {
resetTableDefinitions(collection);
})
.catch((error) => {
snackError({
messageTxt: error,
snackWithFallback(snackError, error, {
headerId: 'spreadsheet/create_new_spreadsheet/error_loading_collection',
});
});
Expand Down Expand Up @@ -329,10 +322,7 @@ const App = () => {
dispatch(setOptionalServices(retrieveOptionalServices(services)));
})
.catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'optionalServicesRetrievingError',
});
snackWithFallback(snackError, error, { headerId: 'optionalServicesRetrievingError' });
});

// Dispatch globally when all params are loaded to allow easy waiting.
Expand All @@ -349,12 +339,7 @@ const App = () => {
.then(() => {
dispatch(setParamsLoaded());
})
.catch((error) =>
snackError({
messageTxt: error.message,
headerId: 'paramsRetrievingError',
})
);
.catch((error) => snackWithFallback(snackError, error, { headerId: 'paramsRetrievingError' }));
}
}, [user, studyUuid, dispatch, updateParams, snackError, updateNetworkVisualizationsParams, resetTableDefinitions]);

Expand Down
15 changes: 5 additions & 10 deletions src/components/dialogs/commons/use-form-search-copy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
type EquipmentInfos,
type EquipmentType,
type ExtendedEquipmentType,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { EQUIPMENT_INFOS_TYPES, type EQUIPMENT_TYPES } from '../../utils/equipment-types';
Expand Down Expand Up @@ -65,16 +66,10 @@ export function useFormSearchCopy(
});
})
.catch((error) => {
console.error(`error while fetching equipment ${element.id} : message = ${error.message}`);
let msg;
if (error.status === 404) {
msg = intl.formatMessage({ id: 'EquipmentCopyFailed404' }, { equipmentId: element.id });
} else {
msg = `${intl.formatMessage({ id: 'EquipmentCopyFailed' }, { equipmentId: element.id })} ${
error.message
}`;
}
snackError({ messageTxt: msg });
snackWithFallback(snackError, error, {
headerId: 'EquipmentCopyFailed',
headerValues: { equipmentId: element.id },
});
})
.finally(() => handleCloseSearchDialog()),
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Typography from '@mui/material/Typography';
import { FormattedMessage } from 'react-intl';
import Grid from '@mui/material/Grid';
import Button from '@mui/material/Button';
import { AutocompleteInput, CustomFormProvider, useSnackMessage } from '@gridsuite/commons-ui';
import { AutocompleteInput, CustomFormProvider, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import {
fetchDynamicSimulationParameters,
updateDynamicSimulationParameters,
Expand Down Expand Up @@ -90,8 +90,7 @@ export function DynamicSimulationParametersSelector({
reset({ ...emptyFormData, [MAPPING]: paramsPlusMappings.mapping });
})
.catch((error) => {
snackError({
messageTxt: error.message,
snackWithFallback(snackError, error, {
headerId: 'DynamicSimulationGetMappingError',
});
});
Expand All @@ -115,8 +114,7 @@ export function DynamicSimulationParametersSelector({
onStart(newDynamicSimulationParams);
})
.catch((error) => {
snackError({
messageTxt: error.message,
snackWithFallback(snackError, error, {
headerId: 'DynamicSimulationParametersChangeError',
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Event, EventProperty, EventPropertyName, PrimitiveTypes } from './types
import yup from 'components/utils/yup-config';
import { getSchema } from './util/event-yup';
import { eventDefinitions, getEventType } from './model/event.model';
import { CustomFormProvider, useSnackMessage } from '@gridsuite/commons-ui';
import { CustomFormProvider, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { FetchStatus } from '../../../../services/utils';
import { EQUIPMENT_TYPES } from '../../../utils/equipment-types';
import { useSelector } from 'react-redux';
Expand Down Expand Up @@ -161,8 +161,7 @@ export const DynamicSimulationEventDialog = (props: DynamicSimulationEventDialog
};

saveDynamicSimulationEvent(studyUuid, currentNodeId, submitEvent).catch((error) => {
snackError({
messageTxt: error.message,
snackWithFallback(snackError, error, {
headerId: 'DynamicSimulationEventSaveError',
});
});
Expand Down
6 changes: 2 additions & 4 deletions src/components/dialogs/export-network-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
fetchDirectoryElementPath,
FlatParameters,
Parameter,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { ExportFormatProperties, getAvailableExportFormats } from '../../services/study';
Expand Down Expand Up @@ -99,10 +100,7 @@ export function ExportNetworkDialog({
setFileName(`${studyName}_${nodeName}`);
})
.catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'LoadStudyAndParentsInfoError',
});
snackWithFallback(snackError, error, { headerId: 'LoadStudyAndParentsInfoError' });
});
}
}, [studyUuid, nodeName, snackError]);
Expand Down
15 changes: 9 additions & 6 deletions src/components/dialogs/import-modification-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
*/

import { useIntl } from 'react-intl';
import { ElementType, useSnackMessage, DirectoryItemSelector, TreeViewFinderNodeProps } from '@gridsuite/commons-ui';
import {
ElementType,
useSnackMessage,
DirectoryItemSelector,
TreeViewFinderNodeProps,
snackWithFallback,
} from '@gridsuite/commons-ui';
import { copyOrMoveModifications } from '../../services/study';
import { FunctionComponent } from 'react';
import { useSelector } from 'react-redux';
Expand Down Expand Up @@ -41,11 +47,8 @@ const ImportModificationDialog: FunctionComponent<ImportModificationDialogProps>
originStudyUuid: studyUuid,
originNodeUuid: currentNode.id,
};
copyOrMoveModifications(studyUuid, currentNode.id, modificationUuidList, copyInfos).catch((errmsg) => {
snackError({
messageTxt: errmsg,
headerId: 'errDuplicateModificationMsg',
});
copyOrMoveModifications(studyUuid, currentNode.id, modificationUuidList, copyInfos).catch((error) => {
snackWithFallback(snackError, error, { headerId: 'errDuplicateModificationMsg' });
});
}
// close the file selector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import LineTypesCatalogSelectorDialog from './line-types-catalog-selector-dialog
import { roundToDefaultPrecision } from '../../../utils/rounding';
import LineTypeSegmentCreation from './line-type-segment-creation';
import { calculateReactance, calculateResistance, calculateSusceptance } from '../../utils/utils';
import { CustomAGGrid, type MuiStyles, useSnackMessage } from '@gridsuite/commons-ui';
import { CustomAGGrid, type MuiStyles, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { getLineTypesCatalog } from '../../../services/network-modification';
import GridItem from '../commons/grid-item';
import { CurrentLimitsInfo, LineTypeInfo } from './line-catalog.type';
Expand Down Expand Up @@ -68,8 +68,7 @@ export const LineTypeSegmentForm = () => {
setLineTypesCatalog(values);
})
.catch((error) =>
snackError({
messageTxt: error.message,
snackWithFallback(snackError, error, {
headerId: 'LineTypesCatalogFetchingError',
})
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { useCallback, useRef, useState } from 'react';
import { CustomFormProvider, Option, useSnackMessage } from '@gridsuite/commons-ui';
import { CustomFormProvider, Option, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { AgGridReact } from 'ag-grid-react';
import { CATEGORIES_TABS, CurrentLimitsInfo, LineTypeInfo } from './line-catalog.type';
import {
Expand Down Expand Up @@ -210,8 +210,7 @@ export default function LineTypesCatalogSelectorDialog({
setUndergroundShapeFactors(createOptionsFromUndergroundShapeFactors(selectedData));
}
} catch (error) {
snackError({
messageTxt: (error as Error).message,
snackWithFallback(snackError, error, {
headerId: 'LineTypesCatalogFetchingError',
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
import { ModificationDialog } from 'components/dialogs/commons/modificationDialog';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { catchErrorHandler, CustomFormProvider, useSnackMessage } from '@gridsuite/commons-ui';
import { catchErrorHandler, CustomFormProvider, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { FieldErrors, useForm } from 'react-hook-form';
import { yupResolver } from '@hookform/resolvers/yup';
import {
Expand Down Expand Up @@ -249,12 +249,9 @@ export function BalancesAdjustmentDialog({
}),
});
} catch (error) {
catchErrorHandler(error, (message) =>
snackError({
messageTxt: message,
headerId: 'GenerationDispatchError',
})
);
snackWithFallback(snackError, error, {
headerId: 'GenerationDispatchError',
});
}
},
[editData, studyUuid, currentNodeUuid, snackError]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ import { ModificationDialog } from '../../../commons/modificationDialog';
import EquipmentSearchDialog from '../../../equipment-search-dialog';
import { useCallback, useEffect } from 'react';
import { useFormSearchCopy } from '../../../commons/use-form-search-copy';
import { CustomFormProvider, EquipmentType, MODIFICATION_TYPES, useSnackMessage } from '@gridsuite/commons-ui';
import {
CustomFormProvider,
EquipmentType,
MODIFICATION_TYPES,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { yupResolver } from '@hookform/resolvers/yup';
import yup from 'components/utils/yup-config';
import {
Expand Down Expand Up @@ -242,8 +248,7 @@ export default function BatteryCreationDialog({
modificationUuid: editData?.uuid,
isUpdate: !!editData,
}).catch((error) => {
snackError({
messageTxt: error.message,
snackWithFallback(snackError, error, {
headerId: 'BatteryCreationError',
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
*/

import { useCallback, useEffect, useState } from 'react';
import { CustomFormProvider, EquipmentType, MODIFICATION_TYPES, useSnackMessage } from '@gridsuite/commons-ui';
import {
CustomFormProvider,
EquipmentType,
MODIFICATION_TYPES,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { yupResolver } from '@hookform/resolvers/yup';
import yup from 'components/utils/yup-config';
import {
Expand Down Expand Up @@ -318,10 +324,7 @@ export default function BatteryModificationDialog({
modificationUuid: editData?.uuid ?? null,
isUpdate: !!editData,
}).catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'BatteryModificationError',
});
snackWithFallback(snackError, error, { headerId: 'BatteryModificationError' });
});
},
[selectedId, studyUuid, currentNodeUuid, editData, snackError]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
convertOutputValue,
CustomFormProvider,
FieldType,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { FC, useCallback, useEffect, useMemo } from 'react';
Expand Down Expand Up @@ -129,10 +130,7 @@ const ModificationByAssignmentDialog: FC<any> = ({
!!editData,
editData?.uuid ?? null
).catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'ModifyByAssignment',
});
snackWithFallback(snackError, error, { headerId: 'ModifyByAssignment' });
});
},
[currentNodeUuid, editData, emptyValueStr, snackError, studyUuid]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { yupResolver } from '@hookform/resolvers/yup';
import yup from 'components/utils/yup-config';
import { FILTERS, ID, NAME, TYPE } from '../../../../utils/field-constants';
import { CustomFormProvider, useSnackMessage } from '@gridsuite/commons-ui';
import { CustomFormProvider, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { useForm } from 'react-hook-form';
import { FunctionComponent, useCallback, useEffect } from 'react';
import { ModificationDialog } from '../../../commons/modificationDialog';
Expand Down Expand Up @@ -99,10 +99,7 @@ const ByFilterDeletionDialog: FunctionComponent<ByFilterDeletionDialogProps> = (
formData[FILTERS],
editData?.uuid
).catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'UnableToDeleteEquipment',
});
snackWithFallback(snackError, error, { headerId: 'UnableToDeleteEquipment' });
});
},
[currentNodeUuid, editData, snackError, studyUuid]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
convertOutputValue,
CustomFormProvider,
FieldType,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { useCallback, useEffect } from 'react';
Expand Down Expand Up @@ -173,10 +174,7 @@ const ByFormulaDialog = ({ editData, currentNode, studyUuid, isUpdate, editDataF
!!editData,
editData?.uuid ?? null
).catch((error) => {
snackError({
messageTxt: error.message,
headerId: 'ModifyByFormula',
});
snackWithFallback(snackError, error, { headerId: 'ModifyByFormula' });
});
},
[currentNodeUuid, editData, snackError, studyUuid]
Expand Down
Loading
Loading