diff --git a/DashAI/front/src/components/notebooks/converterCreation/ConverterTargetColumnModal.jsx b/DashAI/front/src/components/notebooks/converterCreation/ConverterTargetColumnModal.jsx index 021a2261c..02c1768de 100644 --- a/DashAI/front/src/components/notebooks/converterCreation/ConverterTargetColumnModal.jsx +++ b/DashAI/front/src/components/notebooks/converterCreation/ConverterTargetColumnModal.jsx @@ -155,7 +155,6 @@ const ConverterTargetColumnModal = ({ variant="outlined" size="small" sx={{ - mr: 2, color: classColumnInitialValue === null ? "error.main" : "inherit", borderColor: classColumnInitialValue === null ? "error.main" : "inherit", diff --git a/DashAI/front/src/components/notebooks/converterCreation/ScopeStepConverter.jsx b/DashAI/front/src/components/notebooks/converterCreation/ScopeStepConverter.jsx index 36332b30b..7eef4c7a7 100644 --- a/DashAI/front/src/components/notebooks/converterCreation/ScopeStepConverter.jsx +++ b/DashAI/front/src/components/notebooks/converterCreation/ScopeStepConverter.jsx @@ -131,22 +131,14 @@ export default function ScopeStepConverter({ sx={{ flexShrink: 0, display: "flex", - justifyContent: "flex-end", - gap: 2, - pt: 1, + alignItems: "center", + gap: 1, + mt: "auto", + pt: 2, + borderTop: 1, + borderColor: "divider", }} > - {supervised && ( - - - - - - )} - {supervised && ( { @@ -162,19 +154,33 @@ export default function ScopeStepConverter({ notebook={notebook} /> )} - + {supervised && ( + + + + + + )} - {/* Buttons */} - 0 - ? t("common:next") - : t("common:save") - } - data-tour="converter-scope-next-button" - /> + + 0 + ? t("common:next") + : t("common:save") + } + data-tour="converter-scope-next-button" + sx={{ borderTop: 0, pt: 0, mt: 0 }} + /> + + ); } diff --git a/DashAI/front/src/components/shared/FormSchemaButtonGroup.jsx b/DashAI/front/src/components/shared/FormSchemaButtonGroup.jsx index ea2048256..24ea046e0 100644 --- a/DashAI/front/src/components/shared/FormSchemaButtonGroup.jsx +++ b/DashAI/front/src/components/shared/FormSchemaButtonGroup.jsx @@ -11,6 +11,7 @@ function FormSchemaButtonGroup({ saveButtonText, backButtonText, dataTour, + sx, }) { const { t } = useTranslation(["common", "datasets"]); const finalSaveText = saveButtonText ?? t("common:save"); @@ -45,6 +46,7 @@ function FormSchemaButtonGroup({ showBack={!!onCancel} showNext={!!onFormSubmit} nextDataTour={finalDataTour} + sx={sx} /> ); } @@ -58,6 +60,7 @@ FormSchemaButtonGroup.propTypes = { saveButtonText: PropTypes.string, backButtonText: PropTypes.string, dataTour: PropTypes.string, + sx: PropTypes.object, }; export default FormSchemaButtonGroup;