From 4fb9355e4f967944402f1a5545ec2e336fe111ab Mon Sep 17 00:00:00 2001 From: Marina Fedyantceva Date: Wed, 4 Dec 2024 13:23:06 +0300 Subject: [PATCH 1/4] [SPT-767] fixed styles for dataset preset tab --- .../ServiceDetails/DataPreset/DatasetInfo/styles.js | 8 ++++---- .../ServiceDetails/DataPreset/DatasetsList/styles.js | 7 +++++++ src/components/ServiceDetails/DataPreset/index.js | 8 ++++---- src/components/ServiceDetails/DataPreset/styles.js | 12 ++++++++++++ src/components/common/SNETFileUpload/styles.js | 2 +- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/components/ServiceDetails/DataPreset/DatasetInfo/styles.js b/src/components/ServiceDetails/DataPreset/DatasetInfo/styles.js index da64bef8..06b27c59 100644 --- a/src/components/ServiceDetails/DataPreset/DatasetInfo/styles.js +++ b/src/components/ServiceDetails/DataPreset/DatasetInfo/styles.js @@ -1,6 +1,6 @@ export const useStyles = (theme) => ({ datasetParameter: { - minWidth: "100px", + flex: 1, display: "flex", padding: "14px 10px", flexDirection: "column", @@ -60,11 +60,11 @@ export const useStyles = (theme) => ({ parameterTitle: { margin: 0, fontSize: 17, - fontWeight: 700, + fontWeight: 600, }, parameterValue: { margin: 0, - fontSize: 28, - fontWeight: 700, + fontSize: 24, + fontWeight: 600, }, }); diff --git a/src/components/ServiceDetails/DataPreset/DatasetsList/styles.js b/src/components/ServiceDetails/DataPreset/DatasetsList/styles.js index 9a401b10..04b4e2eb 100644 --- a/src/components/ServiceDetails/DataPreset/DatasetsList/styles.js +++ b/src/components/ServiceDetails/DataPreset/DatasetsList/styles.js @@ -5,6 +5,7 @@ export const useStyles = (theme) => ({ gap: 16, }, datasetLine: { + boxSizing: "border-box", display: "flex", padding: "8px 12px", justifyContent: "space-between", @@ -15,6 +16,12 @@ export const useStyles = (theme) => ({ background: theme.palette.text.gray, cursor: "pointer", }, + datasetName: { + whiteSpace: "wrap", + textOverflow: "ellipsis", + width: "100%", + overflow: "hidden", + }, datasetTag: { padding: 5, borderRadius: 6, diff --git a/src/components/ServiceDetails/DataPreset/index.js b/src/components/ServiceDetails/DataPreset/index.js index bdaa5543..c2c2f8dd 100644 --- a/src/components/ServiceDetails/DataPreset/index.js +++ b/src/components/ServiceDetails/DataPreset/index.js @@ -73,15 +73,15 @@ const DataPreset = ({ classes }) => { const goToCreateModel = () => { const baseUrl = DatafactoryInstanceS3.getUri(); - const link =`${baseUrl}/download?key=${mainDataset.datasetKey}` + const link = `${baseUrl}/download?key=${mainDataset.datasetKey}`; const model = { dataset: { - ...mainDataset, + ...mainDataset, link, }, modelName: mainDataset.name, description: mainDataset.name, - } + }; dispatch(setCurrentModelDetails(model)); navigate(location.pathname.split("tab/")[0] + "tab/" + 3, { state: { isOpenCreatingModel: true } }); }; @@ -116,7 +116,7 @@ const DataPreset = ({ classes }) => {

Upload Your Dataset

-
+
({ display: "flex", justifyContent: "space-between", gap: 30, + "@media(max-width: 1024px)": { + flexDirection: "column", + }, }, fineTuneBatton: { textAlign: "right", @@ -16,7 +19,16 @@ export const useStyles = (theme) => ({ alignItems: "center", }, fileZone: { + width: "40%", + "@media(max-width: 1024px)": { + width: "100% !important", + }, + }, + fileZoneExtended: { width: "50%", + "@media(max-width: 1024px)": { + width: "100% !important", + }, }, mergeButtonContainer: { "& button": { diff --git a/src/components/common/SNETFileUpload/styles.js b/src/components/common/SNETFileUpload/styles.js index 1a0bce75..f75e135e 100644 --- a/src/components/common/SNETFileUpload/styles.js +++ b/src/components/common/SNETFileUpload/styles.js @@ -9,7 +9,7 @@ export const useStyles = makeStyles((MUITheme) => ({ boxSizing: "border-box", position: "relative", width: "100%", - padding: "50px 45px !important", + padding: "50px 25px !important", borderWidth: 1, borderStyle: "dashed", borderColor: MUITheme.palette.text.darkGray, From e820f3cabf7399339ec281b58f48551d62d8ea6b Mon Sep 17 00:00:00 2001 From: Marina Fedyantceva Date: Wed, 4 Dec 2024 13:39:22 +0300 Subject: [PATCH 2/4] [SPT-767] fixed prop name for improved dataset --- .../ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js | 2 +- .../ServiceDetails/DataPreset/DashboardModal/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js b/src/components/ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js index 9c93c236..6325da27 100644 --- a/src/components/ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js +++ b/src/components/ServiceDetails/DataPreset/DashboardModal/ButtonGroup.js @@ -29,7 +29,7 @@ const ButtonsGroup = ({ classes, selectedParameters, isTableView, toggleTableVie const improvedDataset = { additionalInfo: { analysis: data.analysis, - datasaet_sample: data.dataset_sample, + dataset_sample: data.dataset_sample, }, datasetKey: data.dataset_key_new, name: dataset.name + "_improved_rate_" + data.analysis.overall_score, diff --git a/src/components/ServiceDetails/DataPreset/DashboardModal/index.js b/src/components/ServiceDetails/DataPreset/DashboardModal/index.js index 09e8a04e..118e6ece 100644 --- a/src/components/ServiceDetails/DataPreset/DashboardModal/index.js +++ b/src/components/ServiceDetails/DataPreset/DashboardModal/index.js @@ -29,7 +29,7 @@ const DashboardModal = ({ classes, onClose, isShow, dataset, index }) => { toggleTableView={toggleTableView} index={index} /> - {isTableView && (dataset?.additionalInfo?.dataset_sample || dataset?.additionalInfo?.datasaet_sample) && ( + {isTableView && dataset?.additionalInfo?.dataset_sample && ( )} From 383d4d9a987d3b337235e7eaa8ee1c65592134a0 Mon Sep 17 00:00:00 2001 From: Marina Fedyantceva Date: Wed, 4 Dec 2024 13:49:37 +0300 Subject: [PATCH 3/4] [SPT-767] added a check against an empty table for the sample table --- .../ServiceDetails/DataPreset/DashboardModal/Table/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/ServiceDetails/DataPreset/DashboardModal/Table/index.js b/src/components/ServiceDetails/DataPreset/DashboardModal/Table/index.js index 3631f9de..942897ef 100644 --- a/src/components/ServiceDetails/DataPreset/DashboardModal/Table/index.js +++ b/src/components/ServiceDetails/DataPreset/DashboardModal/Table/index.js @@ -2,6 +2,10 @@ import { withStyles } from "@mui/styles"; import { useStyles } from "./styles"; const TableSamples = ({ classes, tableData }) => { + if (tableData.length === 0) { + return null; + } + const headData = tableData[0]; const bodyData = tableData.length >= 2 ? tableData.slice(1) : []; From fa9647446200d981c33d580a41b56e0b1b2d2b74 Mon Sep 17 00:00:00 2001 From: Marina Fedyantceva Date: Wed, 4 Dec 2024 13:50:09 +0300 Subject: [PATCH 4/4] [SPT-767] removed log for treemap graph --- .../DataPreset/DashboardModal/Graphs/TreemapGraph.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/ServiceDetails/DataPreset/DashboardModal/Graphs/TreemapGraph.js b/src/components/ServiceDetails/DataPreset/DashboardModal/Graphs/TreemapGraph.js index 65bf664c..21bb9692 100644 --- a/src/components/ServiceDetails/DataPreset/DashboardModal/Graphs/TreemapGraph.js +++ b/src/components/ServiceDetails/DataPreset/DashboardModal/Graphs/TreemapGraph.js @@ -2,8 +2,6 @@ import { Treemap } from "recharts"; import { roundToDesimals } from "../../../../../utility/JSHelper"; const TreemapGraph = ({ data }) => { - console.log("data: ", data); - // const dataKeys = Object.keys(data[0]); const labelKey = "name"; //dataKeys[0];