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
141 changes: 0 additions & 141 deletions src/components/dialogs/dialog-utils.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ 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, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import {
AutocompleteInput,
CustomFormProvider,
getIdOrSelf,
snackWithFallback,
useSnackMessage,
} from '@gridsuite/commons-ui';
import {
fetchDynamicSimulationParameters,
updateDynamicSimulationParameters,
} from '../../../services/study/dynamic-simulation';
import { useForm } from 'react-hook-form';
import { yupResolver } from '@hookform/resolvers/yup';
import { getIdOrSelf } from '../dialog-utils';
import GridItem from '../commons/grid-item';
import type { UUID } from 'node:crypto';
import { DynamicSimulationParametersInfos } from '../../../services/study/dynamic-simulation.type';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import { Grid, TextField } from '@mui/material';
import { filledTextField } from '../../dialog-utils';
import { Event, EventDefinition, EventPropertyName } from './types/event.type';
import { makeComponentFor } from './util/event-rhf';
import { useIntl } from 'react-intl';
import { EQUIPMENT_TYPES } from '../../../utils/equipment-types';
import GridItem from '../../commons/grid-item';
import { filledTextField } from '@gridsuite/commons-ui';

export type DynamicSimulationBasicEventFormProps = {
equipmentId: string;
Expand Down
9 changes: 7 additions & 2 deletions src/components/dialogs/equipment-id/equipment-id-selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
*/

import { useEffect, useState } from 'react';
import { filledTextField } from '../dialog-utils';
import type { UUID } from 'node:crypto';
import { Autocomplete, Box, CircularProgress, Grid, TextField } from '@mui/material';
import { type EquipmentType, type ExtendedEquipmentType, FieldLabel, type MuiStyles } from '@gridsuite/commons-ui';
import {
type EquipmentType,
type ExtendedEquipmentType,
FieldLabel,
filledTextField,
type MuiStyles,
} from '@gridsuite/commons-ui';
import { FormFiller } from './formFiller.js';
import { FormattedMessage } from 'react-intl';
import { fetchEquipmentsIds } from '../../../services/study/network-map';
Expand Down
5 changes: 2 additions & 3 deletions src/components/dialogs/limits/limits-pane-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { sanitizeString } from '../dialog-utils';
import {
APPLICABILITY_FIELD,
CURRENT_LIMITS,
Expand All @@ -25,7 +24,6 @@ import {
TEMPORARY_LIMIT_NAME,
TEMPORARY_LIMIT_VALUE,
TEMPORARY_LIMITS,
VALUE,
} from 'components/utils/field-constants';
import {
areArrayElementsUnique,
Expand All @@ -46,6 +44,7 @@ import { LineModificationFormSchema } from '../network-modifications/line/modifi
import { OperationalLimitsGroupFormSchema, TemporaryLimitFormSchema } from './operational-limits-groups-types';
import { TestContext } from 'yup';
import { APPLICABILITY } from 'components/network/constants';
import { FieldConstants, sanitizeString } from '@gridsuite/commons-ui';

const limitsGroupValidationSchema = () => ({
[ID]: yup.string().nonNullable().required(),
Expand All @@ -72,7 +71,7 @@ const temporaryLimitsValidationSchema = () => {
const limitsPropertyValidationSchema = () => {
return yup.object().shape({
[NAME]: yup.string().required(),
[VALUE]: yup.string().required(),
[FieldConstants.VALUE]: yup.string().required(),
});
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/dialogs/limits/limits-side-pane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { Box, Grid } from '@mui/material';
import { FormattedMessage, useIntl } from 'react-intl';
import {
AmpereAdornment,
ColumnNumeric,
ColumnText,
DndColumn,
Expand All @@ -32,7 +33,6 @@ import {
TEMPORARY_LIMIT_VALUE,
TEMPORARY_LIMITS,
} from 'components/utils/field-constants';
import { AmpereAdornment } from '../dialog-utils';
import { useCallback, useEffect, useMemo } from 'react';
import { useController, useFormContext } from 'react-hook-form';
import { isNodeBuilt } from '../../graph/util/model-functions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
TEMPORARY_LIMIT_NAME,
TEMPORARY_LIMIT_VALUE,
TEMPORARY_LIMITS,
VALUE,
} from '../../utils/field-constants';
import { FieldConstants } from '@gridsuite/commons-ui';

export interface LimitsFormSchema {
[LIMITS]: OperationalLimitsGroupsFormSchema;
Expand Down Expand Up @@ -52,7 +52,7 @@ export interface CurrentLimitsFormSchema {

interface LimitsPropertyFormSchema {
[NAME]: string;
[VALUE]: string;
[FieldConstants.VALUE]: string;
}

export interface TemporaryLimitFormSchema {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

import { useCallback, useEffect } from 'react';
import { useWatch } from 'react-hook-form';
import { KilometerAdornment } from '../dialog-utils';
import EditIcon from '@mui/icons-material/Edit';
import { FloatInput } from '@gridsuite/commons-ui';
import { FloatInput, KilometerAdornment } from '@gridsuite/commons-ui';
import { IconButton } from '@mui/material';
import {
SEGMENT_DISTANCE_VALUE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import yup from 'components/utils/yup-config';
import { ModificationDialog } from '../commons/modificationDialog';
import { useForm } from 'react-hook-form';
import { LineTypeSegmentForm } from './line-type-segment-form';
import { CustomFormProvider } from '@gridsuite/commons-ui';
import { CustomFormProvider, DeepNullable } from '@gridsuite/commons-ui';
import { ComputedLineCharacteristics } from './line-catalog.type';
import { SegmentSchema } from './segment-utils';
import {
Expand All @@ -22,7 +22,6 @@ import {
TOTAL_SUSCEPTANCE,
} from '../../utils/field-constants';
import { InferType } from 'yup';
import { DeepNullable } from '../../utils/ts-utils';

const LineTypeSegmentSchema = yup
.object()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useFormContext } from 'react-hook-form';
import { Box, Grid } from '@mui/material';
import { FormattedMessage, useIntl } from 'react-intl';
import { ExpandableInput } from '../../utils/rhf-inputs/expandable-input';
import { ReadOnlyInput } from '../../utils/rhf-inputs/read-only/read-only-input';
import {
FINAL_CURRENT_LIMITS,
Expand All @@ -32,6 +31,7 @@ import { calculateReactance, calculateResistance, calculateSusceptance } from '.
import {
CustomAGGrid,
DefaultCellRenderer,
ExpandableInput,
type MuiStyles,
snackWithFallback,
useSnackMessage,
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, snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
import { CustomFormProvider, Option, snackWithFallback, useSnackMessage, DeepNullable } from '@gridsuite/commons-ui';
import { AgGridReact } from 'ag-grid-react';
import { CATEGORIES_TABS, CurrentLimitsInfo, LineTypeInfo } from './line-catalog.type';
import {
Expand All @@ -22,7 +22,6 @@ import { getLineTypeWithLimits } from '../../../services/network-modification';
import { ModificationDialog } from '../commons/modificationDialog';
import yup from '../../utils/yup-config';
import { yupResolver } from '@hookform/resolvers/yup';
import { DeepNullable } from 'components/utils/ts-utils';
import LineTypesCatalogSelectorForm from './line-types-catalog-selector-form';

const formSchema = yup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import {
ACTIVE_POWER_SET_POINT,
ADDITIONAL_PROPERTIES,
BUS_OR_BUSBAR_SECTION,
CONNECTED,
CONNECTION_DIRECTION,
Expand All @@ -31,14 +30,14 @@ import {
TRANSIENT_REACTANCE,
VOLTAGE_LEVEL,
} from '../../../utils/field-constants';
import { Property } from '../common/properties/property-utils';
import { ConnectablePositionFormInfos } from '../../connectivity/connectivity.type';
import {
MinMaxReactiveLimitsFormInfos,
ReactiveCapabilityCurvePoints,
} from '../../reactive-limits/reactive-limits.type';
import { ActivePowerControlInfos } from '../../active-power-control/active-power-control.type';
import { ShortCircuitFormInfos } from '../../short-circuit/short-circuit-utils';
import { FieldConstants, Property } from '@gridsuite/commons-ui';

export type BatteryDialogSchemaBaseForm = {
[EQUIPMENT_NAME]?: string;
Expand All @@ -63,7 +62,7 @@ export type BatteryDialogSchemaBaseForm = {
[REACTIVE_CAPABILITY_CURVE_TABLE]?: ReactiveCapabilityCurvePoints[];
};
// Properties
[ADDITIONAL_PROPERTIES]?: Property[];
[FieldConstants.ADDITIONAL_PROPERTIES]?: Property[];
[TRANSFORMER_REACTANCE]?: number | null;
[TRANSIENT_REACTANCE]?: number | null;
};
Expand Down
Loading
Loading