Skip to content

Align action buttons in footer with stepper navigation #751

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

Merged
cristian-tamblay merged 2 commits into from
Jul 7, 2026
Merged

Align action buttons in footer with stepper navigation #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15bbcf3
fix: align converter scope action buttons in single footer row
Irozuku Jul 1, 2026
d9c5d05
Merge branch 'develop' into fix/converter-scope-button-layout
Irozuku Jul 1, 2026
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
1 change: 0 additions & 1 deletion DashAI/front/src/components/notebooks/converterCreation/ConverterTargetColumnModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
58 changes: 32 additions & 26 deletions DashAI/front/src/components/notebooks/converterCreation/ScopeStepConverter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
<Tooltip
title={t("datasets:label.helpSelectClassColumn")}
placement="top"
>
<IconButton>
<HelpIcon />
</IconButton>
</Tooltip>
)}

{supervised && (
<ConverterClassColumnModal
updateClassColumn={(column) => {
Expand All @@ -162,19 +154,33 @@ export default function ScopeStepConverter({
notebook={notebook}
/>
)}
</Box>
{supervised && (
<Tooltip
title={t("datasets:label.helpSelectClassColumn")}
placement="top"
>
<IconButton>
<HelpIcon />
</IconButton>
</Tooltip>
)}

{/* Buttons */}
<FormSchemaButtonGroup
onFormSubmit={handleSubmit}
error={!isColumnSelectionValid || (supervised ? !targetColumn : false)}
saveButtonText={
Object.values(tool.schema.properties).length > 0
? t("common:next")
: t("common:save")
}
data-tour="converter-scope-next-button"
/>
<Box sx={{ flexGrow: 1 }}>
<FormSchemaButtonGroup
onFormSubmit={handleSubmit}
error={
!isColumnSelectionValid || (supervised ? !targetColumn : false)
}
saveButtonText={
Object.values(tool.schema.properties).length > 0
? t("common:next")
: t("common:save")
}
data-tour="converter-scope-next-button"
sx={{ borderTop: 0, pt: 0, mt: 0 }}
/>
</Box>
</Box>
</Box>
);
}
3 changes: 3 additions & 0 deletions DashAI/front/src/components/shared/FormSchemaButtonGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function FormSchemaButtonGroup({
saveButtonText,
backButtonText,
dataTour,
sx,
}) {
const { t } = useTranslation(["common", "datasets"]);
const finalSaveText = saveButtonText ?? t("common:save");
Expand Down Expand Up @@ -45,6 +46,7 @@ function FormSchemaButtonGroup({
showBack={!!onCancel}
showNext={!!onFormSubmit}
nextDataTour={finalDataTour}
sx={sx}
/>
);
}
Expand All @@ -58,6 +60,7 @@ FormSchemaButtonGroup.propTypes = {
saveButtonText: PropTypes.string,
backButtonText: PropTypes.string,
dataTour: PropTypes.string,
sx: PropTypes.object,
};

export default FormSchemaButtonGroup;
Loading