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
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="icon" href="/favicon.ico" />
<title>GridStudy</title>
</head>
<body class="singlestretch-parent singlestretch-child">
<body data-theme="bleu_iceberg" data-mode="light" class="singlestretch-parent singlestretch-child">
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root" class="singlestretch-parent singlestretch-child"></div>
<script type="module" src="/src/index.jsx"></script>
Expand Down
7 changes: 6 additions & 1 deletion src/components/app-wrapper.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { useMemo } from 'react';
import {useEffect, useMemo} from 'react';
import App from './app';
import {
createTheme,
Expand Down Expand Up @@ -110,6 +110,7 @@ import useNotificationsUrlGenerator from 'hooks/use-notifications-url-generator'
import { AllCommunityModule, ModuleRegistry, provideGlobalGridOptions } from 'ag-grid-community';
import { lightThemeCssVars } from '../styles/light-theme-css-vars';
import { darkThemeCssVars } from '../styles/dark-theme-css-vars';
import "@design-system-rte/react/dist/style.css";

// Register all community features (migration to V33)
ModuleRegistry.registerModules([AllCommunityModule]);
Expand Down Expand Up @@ -470,6 +471,10 @@ const AppWrapperWithRedux = () => {

const urlMapper = useNotificationsUrlGenerator();

useEffect(() => {
document.body.setAttribute('data-mode', theme.toLowerCase());
}, [theme]);

return (
<IntlProvider locale={computedLanguage} messages={messages[computedLanguage]}>
<BrowserRouter basename={basename}>
Expand Down
5 changes: 2 additions & 3 deletions src/components/dialogs/commons/modificationDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { useCallback } from 'react';
import { FieldErrors, FieldValues, useFormContext } from 'react-hook-form';
import { SubmitButton } from '@gridsuite/commons-ui';
import { ValidateButton } from '@gridsuite/commons-ui';
import { ModificationDialogContent, ModificationDialogContentProps } from './modification-dialog-content';

/**
Expand Down Expand Up @@ -80,9 +80,8 @@ export function ModificationDialog<TFieldValues extends FieldValues>({
};

const submitButton = (
<SubmitButton
<ValidateButton
onClick={handleSubmit(handleValidate, handleValidationError)}
variant="outlined"
disabled={disabledSave}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
isObjectEmpty,
mergeSx,
ProviderParam,
SubmitButton,
ValidateButton,
useParametersBackend,
ComputingType,
PopupConfirmationDialog,
Expand Down Expand Up @@ -261,9 +261,7 @@ const DynamicSecurityAnalysisParameters: FunctionComponent<DynamicSecurityAnalys
})}
>
<LabelledButton callback={handleResetClick} label="resetToDefault" />
<SubmitButton variant="outlined" onClick={handleSubmit(onSubmit, onError)}>
<FormattedMessage id={'validate'} />
</SubmitButton>
<ValidateButton onClick={handleSubmit(onSubmit, onError)} />
</Grid>

{/* Reset Confirmation Dialog */}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
mergeSx,
PopupConfirmationDialog,
ProviderParam,
SubmitButton,
ValidateButton,
useParametersBackend,
ComputingType,
} from '@gridsuite/commons-ui';
Expand Down Expand Up @@ -316,9 +316,7 @@ const DynamicSimulationParameters: FunctionComponent<DynamicSimulationParameters
<Button onClick={handleResetClick}>
<FormattedMessage id="resetToDefault" />
</Button>
<SubmitButton variant="outlined" onClick={handleSubmit(onSubmit, onError)}>
<FormattedMessage id={'validate'} />
</SubmitButton>
<ValidateButton onClick={handleSubmit(onSubmit, onError)} />
</DialogActions>
</Grid>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
mergeSx,
PopupConfirmationDialog,
snackWithFallback,
SubmitButton,
ValidateButton,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { Button, DialogActions, Grid, Tab, Tabs } from '@mui/material';
Expand Down Expand Up @@ -209,7 +209,7 @@ export const StateEstimationParameters = ({
<Button onClick={handleResetClick}>
<FormattedMessage id="resetToDefault" />
</Button>
<SubmitButton variant="outlined" onClick={handleSubmit(onSubmit, onValidationError)} />
<ValidateButton onClick={handleSubmit(onSubmit, onValidationError)} />
</DialogActions>
</Grid>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { ActivePowerAdornment, ReactivePowerAdornment } from '../../dialog-utils
import GridItem from '../../commons/grid-item';
import { useCallback } from 'react';
import { useFormContext } from 'react-hook-form';
import { Grid } from '@mui/material';

export interface ReactiveCapabilityCurveRowFormProps {
id: string;
Expand Down Expand Up @@ -47,8 +48,7 @@ export function ReactiveCapabilityCurveRowForm({
const pField = (
<FloatInput
name={`${id}.${index}.${P}`}
label={'P'}
labelValues={{ labelSuffix: labelSuffix }}
label={'P (MW)'}
adornment={ActivePowerAdornment}
onChange={triggerTableValidation}
/>
Expand All @@ -57,8 +57,7 @@ export function ReactiveCapabilityCurveRowForm({
const qminPField = (
<FloatInput
name={`${id}.${index}.${MIN_Q}`}
label={'QminP'}
labelValues={{ labelSuffix: labelSuffix }}
label={'QminP (MVar)'}
adornment={ReactivePowerAdornment}
onChange={triggerTableAndSiblingsValidation}
/>
Expand All @@ -67,8 +66,7 @@ export function ReactiveCapabilityCurveRowForm({
const qmaxPField = (
<FloatInput
name={`${id}.${index}.${MAX_Q}`}
label={'QmaxP'}
labelValues={{ labelSuffix: labelSuffix }}
label={'QmaxP (MVar)'}
adornment={ReactivePowerAdornment}
onChange={triggerTableAndSiblingsValidation}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@

import { useCallback, useEffect } from 'react';
import { FormattedMessage } from 'react-intl';
import { Grid, IconButton } from '@mui/material';
import DeleteIcon from '@mui/icons-material/Delete';
import AddIcon from '@mui/icons-material/ControlPoint';
import { Grid } from '@mui/material';
import { useFieldArray } from 'react-hook-form';
import { MAX_Q, MIN_Q, P } from 'components/utils/field-constants';
import { ErrorInput, MidFormError } from '@gridsuite/commons-ui';
import { INSERT, REMOVE } from './reactive-capability-utils';
import { ReactiveCapabilityCurvePoints } from '../reactive-limits.type';
import { ReactiveCapabilityCurveRowForm } from './reactive-capability-curve-row-form';
import { IconButton } from '@design-system-rte/react';

const MIN_LENGTH = 2;

interface ReactiveCapabilityCurveTableFormProps {
id: string;
tableHeadersIds: string[];
Expand Down Expand Up @@ -90,27 +90,28 @@ export function ReactiveCapabilityCurveTableForm({
labelSuffix = index - 1;
}
return (
<Grid key={value.id} container spacing={3} item>
<Grid key={value.id} direction="row" alignItems="flex-end" container spacing={3} item>
<ReactiveCapabilityCurveRowForm id={id} index={index} labelSuffix={labelSuffix} />
<Grid item xs={1}>
<IconButton
key={value.id}
name="delete"
size="m"
onClick={() => handleRemoveRow(index)}
disabled={disabled || index === 0 || index === displayedValues.length - 1}
>
<DeleteIcon />
</IconButton>
appearance="filled"
variant="transparent"
/>
</Grid>
{index === displayedValues.length - 1 && (
<Grid item xs={1}>
<IconButton
key={value.id}
name="add-circle"
size="m"
onClick={() => handleInsertRow()}
disabled={disabled}
style={{ top: '-1em' }}
>
<AddIcon />
</IconButton>
appearance="outlined"
variant="transparent"
/>
</Grid>
)}
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
type MuiStyles,
MultipleAutocompleteInput,
snackWithFallback,
SubmitButton,
ValidateButton,
TextInput,
useSnackMessage,
type UseStateBooleanReturn,
Expand Down Expand Up @@ -367,7 +367,7 @@ export default function ColumnCreationDialog({
<Grid item xs>
<Box sx={styles.actionButtons}>
<CancelButton onClick={open.setFalse} />
<SubmitButton onClick={handleSubmit(onSubmit)} variant="outlined" />
<ValidateButton onClick={handleSubmit(onSubmit)} />
</Box>
</Grid>
</Grid>
Expand Down
Loading