Skip to content

Move the generate-template button above the tabular table #4072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flomillot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move the generate-template button above the tabular table #4072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions ...ponents/dialogs/network-modifications/limit-sets/limit-sets-tabular-modification-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import {
AutocompleteInput,
BooleanNullableCellRenderer,
CsvDownloadButton,

Check failure on line 14 in src/components/dialogs/network-modifications/limit-sets/limit-sets-tabular-modification-form.tsx

View workflow job for this annotation

GitHub Actions / build / build 

Module '"@gridsuite/commons-ui"' has no exported member 'CsvDownloadButton'.
type CsvProps,
CsvPicker,
CustomAgGridTable,
Expand Down Expand Up @@ -277,20 +278,31 @@
() => ({
fileName: 'limitset_modification_template',
language,
getTemplateData,
getTableData,
}),
[language, getTemplateData, getTableData]
[language, getTableData]
);

return (
<Grid container spacing={2} paddingTop={1} direction="column" wrap="nowrap" sx={[{ height: '100%' }]}>
<Grid sx={{ width: 400, maxWidth: '100%' }}>{equipmentTypeField}</Grid>
<Grid container justifyContent="space-between" alignItems="center">
<Grid>
<IntegerInput name={AMOUNT_TEMPORARY_LIMITS} label={'amountTemporaryLimits'} />
<Grid container alignItems="center">
<Grid>
<IntegerInput name={AMOUNT_TEMPORARY_LIMITS} label={'amountTemporaryLimits'} />
</Grid>
<Grid>
<CsvDownloadButton
data={getTemplateData}
fileName={csvProps.fileName}
language={language}
labelId="GenerateCSV"
variant="contained"
disabled={!equipmentType}
/>
</Grid>
</Grid>
<Grid>
<Grid sx={{ flex: 1, minWidth: 0 }}>
<CsvPicker<Record<string, unknown>>
label="UploadCSV"
header={csvColumns.map((column) => column.id)}
Expand Down
59 changes: 36 additions & 23 deletions src/components/dialogs/network-modifications/tabular/tabular-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import { type FieldValues, type UseFieldArrayReturn, useFormContext, useWatch } from 'react-hook-form';
import {
AutocompleteInput,
CsvDownloadButton,

Check failure on line 13 in src/components/dialogs/network-modifications/tabular/tabular-form.tsx

View workflow job for this annotation

GitHub Actions / build / build 

Module '"@gridsuite/commons-ui"' has no exported member 'CsvDownloadButton'.
type CsvProps,
CsvPicker,
CustomAgGridTable,
Expand Down Expand Up @@ -328,20 +329,9 @@
(dialogMode === TabularModificationType.CREATION ? '_creation' : '_modification') +
'_template',
language,
getTemplateData,
getTableData,
extraButtons:
dialogMode === TabularModificationType.MODIFICATION ? (
<Button
variant="outlined"
onClick={() => prefilledModelDialogOpen.setTrue()}
disabled={!equipmentType}
>
<FormattedMessage id="GeneratePrefilledModel" />
</Button>
) : undefined,
}),
[equipmentType, dialogMode, language, getTemplateData, getTableData, prefilledModelDialogOpen]
[equipmentType, dialogMode, language, getTableData]
);

const { handleGeneratePrefilledModel } = usePrefilledModelGenerator({
Expand Down Expand Up @@ -544,18 +534,41 @@
<Grid container spacing={2} paddingTop={1} direction="column" wrap="nowrap" sx={{ height: '100%' }}>
<Grid sx={{ width: 400, maxWidth: '100%' }}>{equipmentTypeField}</Grid>
<Grid container justifyContent="space-between" alignItems="center">
<Grid>
<Button
variant="contained"
disabled={!equipmentType}
onClick={() => {
propertiesDialogOpen.setTrue();
}}
>
<FormattedMessage id="DefinePropertiesButton" />
</Button>
<Grid container alignItems="center">
<Grid>
<Button
variant="contained"
disabled={!equipmentType}
onClick={() => {
propertiesDialogOpen.setTrue();
}}
>
<FormattedMessage id="DefinePropertiesButton" />
</Button>
</Grid>
<Grid>
<CsvDownloadButton
data={getTemplateData}
fileName={csvProps.fileName}
language={language}
labelId="GenerateCSV"
variant="contained"
disabled={!equipmentType}
/>
</Grid>
{dialogMode === TabularModificationType.MODIFICATION && (
<Grid>
<Button
variant="contained"
onClick={() => prefilledModelDialogOpen.setTrue()}
disabled={!equipmentType}
>
<FormattedMessage id="GeneratePrefilledModel" />
</Button>
</Grid>
)}
</Grid>
<Grid>
<Grid sx={{ flex: 1, minWidth: 0 }}>
<CsvPicker<Record<string, unknown>>
label="UploadCSV"
header={csvColumns}
Expand Down
Loading