Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e7000d2
fix: update input text color to use theme palette
Irozuku Jan 22, 2026
a47e4f0
fix: update box background and border to use theme palette
Irozuku Jan 22, 2026
2d3d6f5
fix: update ToolGridItem to use theme palette for styling
Irozuku Jan 22, 2026
e2109e4
fix: update import paths for SearchBar in SelectTaskMenu and SessionB…
Irozuku Jan 22, 2026
7fd226a
refactor: remove unused SearchBar component
Irozuku Jan 22, 2026
f71682a
fix: update Typography components in OptionBox to use theme palette f…
Irozuku Jan 23, 2026
7983427
fix: update ItemBox to use theme palette for background and hover styles
Irozuku Jan 23, 2026
a726ad5
refactor: replace TaskBox with OptionBox in SelectTaskMenu and remove…
Irozuku Jan 23, 2026
c319b70
refactor: simplify SelectTaskMenu by removing CustomLayout and integr…
Irozuku Jan 23, 2026
214beb6
fix: update HomeButton to use theme palette for text color
Irozuku Jan 23, 2026
6fca37d
fix: update renderInputField to use theme palette and add translation…
Irozuku Jan 23, 2026
6e0dfc3
fix: update ManualInputForm to use theme palette for text and backgro…
Irozuku Jan 23, 2026
05c77cd
fix: remove unused 'searchTasks' label from English and Spanish gener…
Irozuku Jan 23, 2026
88d8985
fix: remove unused 'experiments' description from English and Spanish…
Irozuku Jan 23, 2026
be6b81b
fix: correct indentation in value parsing logic in renderInputField
Irozuku Jan 23, 2026
1c3b02b
Merge branch 'develop' into fix/missing-palette
Irozuku Jan 27, 2026
b259509
fix: add theme usage in dataset upload components
Irozuku Jan 27, 2026
4fb9f86
fix: remove unused effect for fetching generative tasks
Irozuku Jan 27, 2026
3169a56
Merge branch 'develop' into fix/missing-palette
Irozuku Jan 28, 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
2 changes: 1 addition & 1 deletion DashAI/front/src/components/HomeButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function HomeButton({ title, description, to, Icon }) {
to={to}
component={RouterLink}
underline="hover"
color="primary.contrastText"
color={theme.palette.text.primary}
>
{matches && (
<Grid
Expand Down
39 changes: 0 additions & 39 deletions DashAI/front/src/components/generative/SearchBar.jsx

This file was deleted.

60 changes: 10 additions & 50 deletions DashAI/front/src/components/generative/SelectTaskMenu.jsx
Original file line number Diff line number Diff line change
@@ -1,60 +1,20 @@
import { useEffect, useState } from "react";
import { Box, Grid } from "@mui/material";
import TaskBox from "../../components/generative/TaskBox";
import SearchBar from "./SearchBar";
import { getGenerativeTask } from "../../api/generativeTask";
import CustomLayout from "../../components/custom/CustomLayout";
import { useTranslation } from "react-i18next";
import SelectOptionMenu from "../threeSectionLayout/SelectOptionMenu";

export default function SelectTaskMenu({ tasks, goToNextStep }) {
const { t } = useTranslation(["generative", "common"]);

const [search, setSearch] = useState("");

const filteredTasks = tasks.filter((task) =>
task.name.toLowerCase().includes(search.toLowerCase()),
);

return (
<CustomLayout
<SelectOptionMenu
goToNextStep={() => goToNextStep(task.name, task.display_name)}
title={t("generative:label.generativeModule")}
subtitle={t("generative:label.selectGenerativeTask")}
padding={0}
>
<Box
display={"flex"}
height={"100%"}
width={"100%"}
flexDirection={"column"}
justifyContent={"flex-start"}
>
<Box width={"450px"}>
<SearchBar
placeholder={t("generative:label.searchTasks")}
value={search}
onChange={(e) => setSearch(e.target.value)}
/>
</Box>

<Grid
container
direction="row"
justifyContent="flex-start"
alignItems="stretch"
spacing={1}
sx={{ mt: 2, mx: 0, maxWidth: "100%" }}
>
{filteredTasks.map((task, index) => (
<Grid size={{ xl: 4, lg: 6, md: 6, sm: 12, xs: 12 }} key={index}>
<TaskBox
taskName={task.display_name}
description={task.description}
onClick={() => goToNextStep(task.name, task.display_name)}
/>
</Grid>
))}
</Grid>
</Box>
</CustomLayout>
options={tasks.map((task) => ({
name: task.name,
display_name: task.display_name,
description: task.description,
}))}
searchBar={true}
/>
);
}
2 changes: 1 addition & 1 deletion DashAI/front/src/components/generative/SessionBar.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Typography, Divider } from "@mui/material";
import { useTheme } from "@mui/material/styles";
import FolderIcon from "@mui/icons-material/Folder";
import SearchBar from "./SearchBar";
import SearchBar from "../threeSectionLayout/SearchBar";
import { useEffect, useState } from "react";
import InfoSessionModal from "./InfoSessionModal";
import Footer from "./Footer";
Expand Down
63 changes: 0 additions & 63 deletions DashAI/front/src/components/generative/TaskBox.jsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback } from "react";
import { Grid, CircularProgress } from "@mui/material";
import { Grid, CircularProgress, useTheme } from "@mui/material";
import FormSchemaButtonGroup from "../../shared/FormSchemaButtonGroup";
import Upload from "./Upload";
import { useSnackbar } from "notistack";
Expand Down Expand Up @@ -28,6 +28,7 @@ export default function ConfigureAndUploadDatasetStep({

const { enqueueSnackbar } = useSnackbar();
const { t } = useTranslation(["common", "datasets"]);
const theme = useTheme();

useEffect(() => {
if (onPreviewError) {
Expand Down Expand Up @@ -155,7 +156,8 @@ export default function ConfigureAndUploadDatasetStep({
spacing={2}
sx={{
width: "100%",
backgroundColor: "#212121",
backgroundColor: theme.palette.ui.box,
border: `1px solid ${theme.palette.ui.border}`,
padding: 4,
borderRadius: 2,
}}
Expand Down
16 changes: 12 additions & 4 deletions DashAI/front/src/components/notebooks/datasetCreation/Upload.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
DialogContentText,
Grid,
Typography,
useTheme,
} from "@mui/material";

import PreviewDataset from "./PreviewDataset";
Expand Down Expand Up @@ -51,6 +52,7 @@ function Upload({

const { enqueueSnackbar } = useSnackbar();
const { t } = useTranslation(["datasets", "common"]);
const theme = useTheme();

// helper to extract allowed extensions from acceptAttr (returns lowercase extensions like ".csv")
const getAllowedExtensions = (accept) => {
Expand Down Expand Up @@ -273,14 +275,20 @@ function Upload({
</Grid>
{dragActive ? (
<Grid>
<Typography variant="subtitle1">
<Typography
variant="subtitle1"
sx={{ color: theme.palette.text.secondary }}
>
{t("datasets:label.clickToUpload")}
</Typography>
</Grid>
) : (
<React.Fragment>
<Grid>
<Typography variant="subtitle1">
<Typography
variant="subtitle1"
sx={{ color: theme.palette.text.secondary }}
>
{t("datasets:label.dragAndDropFileHere")}
</Typography>
</Grid>
Expand Down Expand Up @@ -343,12 +351,12 @@ function Upload({
container
direction="column"
rowSpacing={1}
sx={{ width: "100%" }}
sx={{ width: "100%", bgcolor: theme.palette.ui.box }}
data-tour="upload-area"
>
{/* state text */}
<Grid sx={{ textAlign: "center" }}>
<DialogContentText>
<DialogContentText sx={{ color: theme.palette.text.primary }}>
{datasetState === EMPTY && t("datasets:label.uploadYourDataset")}
{datasetState === LOADING && t("datasets:label.datasetLoading")}
{datasetState === LOADED && t("datasets:label.datasetPreview")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ export default function ConfigureToolModal({
{/* Tool Description */}
<Box
sx={{
bgcolor: "rgb(44, 44, 44)",
border: "1px solid rgb(39, 39, 42)",
bgcolor: "theme.palette.background.box",
border: `1px solid ${theme.palette.divider}`,
borderRadius: 1.5,
p: 2,
}}
Expand Down
Loading