Skip to content

Commit c83dbf2

Browse files
author
Marina Fedyantceva
committed
[SPT-767] fixed set dataset after improvment
1 parent fa96474 commit c83dbf2

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

src/components/ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ import { useStyles } from "./styles";
33
import StyledButton from "../../../common/StyledButton";
44
import TableIcon from "@mui/icons-material/TableChartOutlined";
55
import { useDispatch } from "react-redux";
6-
import {
7-
addRecentDataset,
8-
improveDataset,
9-
setMainDataset,
10-
setMergeDataset,
11-
} from "../../../../Redux/actionCreators/DatasetActions";
6+
import { addRecentDataset, improveDataset } from "../../../../Redux/actionCreators/DatasetActions";
127
import { startAppLoader, stopAppLoader } from "../../../../Redux/actionCreators/LoaderActions";
138
import { LoaderContent } from "../../../../utility/constants/LoaderContent";
149
import { DatafactoryInstanceS3 } from "../../../../config/DatasetS3Client";
1510
import { getDatasetSizeFromS3 } from "../../../../Redux/actionCreators/ServiceTrainingActions";
1611

17-
const ButtonsGroup = ({ classes, selectedParameters, isTableView, toggleTableView, dataset, index }) => {
12+
const ButtonsGroup = ({ classes, selectedParameters, isTableView, toggleTableView, dataset, setDataset }) => {
1813
const dispatch = useDispatch();
1914

2015
const tableButtonText = isTableView ? "close tablet" : "view tablet";
@@ -37,7 +32,7 @@ const ButtonsGroup = ({ classes, selectedParameters, isTableView, toggleTableVie
3732
tag: dataset.tag,
3833
};
3934
await dispatch(addRecentDataset(improvedDataset));
40-
!index ? await dispatch(setMainDataset(improvedDataset)) : await dispatch(setMergeDataset(improvedDataset));
35+
setDataset(improvedDataset);
4136
} catch (error) {
4237
console.error("getImprovedDataset error", error);
4338
} finally {

src/components/ServiceDetails/DataPreset/DashboardModal/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import TableSamples from "./Table";
77
import { useState } from "react";
88
import ButtonGroup from "./ButtonGroup";
99

10-
const DashboardModal = ({ classes, onClose, isShow, dataset, index }) => {
10+
const DashboardModal = ({ classes, onClose, isShow, dataset, setDatasetInfo }) => {
1111
const [selectedParameters, setSelectedParameters] = useState();
1212
const [isTableView, setIsTableView] = useState(true);
1313

@@ -27,7 +27,7 @@ const DashboardModal = ({ classes, onClose, isShow, dataset, index }) => {
2727
selectedParameters={selectedParameters}
2828
isTableView={isTableView}
2929
toggleTableView={toggleTableView}
30-
index={index}
30+
setDataset={setDatasetInfo}
3131
/>
3232
{isTableView && dataset?.additionalInfo?.dataset_sample && (
3333
<TableSamples tableData={dataset?.additionalInfo?.dataset_sample} />

src/components/ServiceDetails/DataPreset/DatasetUploader/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { loaderActions } from "../../../../Redux/actionCreators";
1616

1717
const acceptedFileTypes = { "application/zip": [".zip"], "application/x-zip-compressed": [".zip"] };
1818

19-
const DatasetUploader = ({ classes, setDatasetInfo, datasetInfo, cleanDatasetInfo, index }) => {
19+
const DatasetUploader = ({ classes, setDatasetInfo, datasetInfo, cleanDatasetInfo, isMainDataset }) => {
2020
const dispatch = useDispatch();
2121

2222
const [trainingDataFileName, setTrainingDataFileName] = useState(datasetInfo?.name);
@@ -121,7 +121,12 @@ const DatasetUploader = ({ classes, setDatasetInfo, datasetInfo, cleanDatasetInf
121121
</>
122122
)}
123123
{isDashbordOpen && (
124-
<DashboardModal onClose={closeDashbordModal} isShow={isDashbordOpen} dataset={datasetInfo} index={index} />
124+
<DashboardModal
125+
onClose={closeDashbordModal}
126+
isShow={isDashbordOpen}
127+
dataset={datasetInfo}
128+
setDatasetInfo={setDatasetInfo}
129+
/>
125130
)}
126131
</div>
127132
);

src/components/ServiceDetails/DataPreset/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ const DataPreset = ({ classes }) => {
121121
datasetInfo={mainDataset}
122122
setDatasetInfo={setMainDatasetFunction}
123123
cleanDatasetInfo={cleanMainDataset}
124-
index={0}
125124
/>
126125
</div>
127126
{mergeDataset && (
@@ -143,7 +142,6 @@ const DataPreset = ({ classes }) => {
143142
datasetInfo={mergeDataset}
144143
setDatasetInfo={setMergeDatasetFunction}
145144
cleanDatasetInfo={cleanMergeDataset}
146-
index={0}
147145
/>
148146
) : (
149147
<div className={classes.emptyFirstDataset}>

0 commit comments

Comments
 (0)