Skip to content

Commit c510266

Browse files
author
Keivan Vosoughi
committed
Add new SDS home page (DatasetsPage) with Ant Design table, search, and export modal
Initial Add New Pages for Datasets & Evaluations Adding Evaluations Table Adding Template Section New Home Page with Templates Adding Exports Page refactor: update DataGenerator config, templates, and routing for new SDS home page integration - Updated DataGenerator/Configure.tsx for improved configuration flow - Refactored Home/TemplateCard.tsx and TemplatesSection.tsx for better template management - Updated routes.tsx to support new navigation and home page structure These changes support the new SDS home page and improve overall navigation and template usability. feat: add colored template tags to TemplateCard for improved template categorization and UI clarity Template Colors refactor: update DataGenerator Examples component for improved structure and maintainability Fix for Usecases in Dataset Table refactor: update DataGenerator components (Configure, FileSelectorButton, FilesTable, UseCaseSelector) for improved file handling and UI enhancements Update SDS Version Fix for RE-generate model providers
1 parent 949a5dd commit c510266

34 files changed

+1432
-397
lines changed

app/client/src/Container.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,25 @@ const pages: MenuItem[] = [
7777
<Link to={`${Pages.GENERATOR}`}>{LABELS[Pages.GENERATOR]}</Link>
7878
),
7979
},
80+
{
81+
key: Pages.DATASETS,
82+
label: (
83+
<Link to={`${Pages.DATASETS}`}>{LABELS[Pages.DATASETS]}</Link>
84+
),
85+
},
86+
{
87+
key: Pages.EVALUATIONS,
88+
label: (
89+
<Link to={`${Pages.EVALUATIONS}`}>{LABELS[Pages.EVALUATIONS]}</Link>
90+
),
91+
},
92+
{
93+
key: Pages.EXPORTS,
94+
label: (
95+
<Link to={`${Pages.EXPORTS}`}>{LABELS[Pages.EXPORTS]}</Link>
96+
),
97+
},
98+
8099
// {
81100
// key: Pages.TELEMETRY,
82101
// label: (
@@ -107,7 +126,7 @@ const pages: MenuItem[] = [
107126
</div>
108127
<Flex justify='center' align='center' vertical style={{ marginTop: '12px' }}>
109128
<StyledSection>
110-
{`SDS-1.0.2`}
129+
{`SDS-1.0.3`}
111130
</StyledSection>
112131
</Flex>
113132
</Flex>
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 8 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 13 additions & 0 deletions
Loading

app/client/src/components/JobStatus/jobStatusIcon.tsx

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Tooltip } from "antd";
22
import { CheckCircleTwoTone, ExclamationCircleTwoTone, InfoCircleTwoTone, LoadingOutlined } from '@ant-design/icons';
33
import { JobStatus } from "../../types";
4+
import styled from "styled-components";
45

56
export type JobStatusProps = {
67
status: JobStatus
@@ -17,25 +18,46 @@ const defaultTooltipTitles: Record<JobStatus, string> = {
1718
'null': 'No job was executed'
1819
}
1920

21+
const IconWrapper = styled.div`
22+
svg {
23+
font-size: 20px;
24+
}
25+
`
26+
27+
2028
export default function JobStatusIcon({ status, customTooltipTitles }: JobStatusProps) {
2129
const tooltipTitles = {...defaultTooltipTitles, ...customTooltipTitles};
2230

2331
function jobStatus() {
2432
switch (status) {
2533
case "ENGINE_SUCCEEDED":
26-
return <Tooltip title={tooltipTitles.ENGINE_SUCCEEDED}><CheckCircleTwoTone twoToneColor="#52c41a" /></Tooltip>;
34+
return <Tooltip title={tooltipTitles.ENGINE_SUCCEEDED}>
35+
<IconWrapper><CheckCircleTwoTone twoToneColor="#52c41a" /></IconWrapper>
36+
</Tooltip>;
2737
case 'ENGINE_STOPPED':
28-
return <Tooltip title={tooltipTitles.ENGINE_STOPPED}><ExclamationCircleTwoTone twoToneColor="red" /></Tooltip>;
38+
return <Tooltip title={tooltipTitles.ENGINE_STOPPED}>
39+
<IconWrapper><ExclamationCircleTwoTone twoToneColor="red" /></IconWrapper>
40+
</Tooltip>;
2941
case 'ENGINE_TIMEDOUT':
30-
return <Tooltip title={tooltipTitles.ENGINE_TIMEDOUT}><ExclamationCircleTwoTone twoToneColor="red" /></Tooltip>;
42+
return <Tooltip title={tooltipTitles.ENGINE_TIMEDOUT}>
43+
<IconWrapper><ExclamationCircleTwoTone twoToneColor="red" /></IconWrapper>
44+
</Tooltip>;
3145
case 'ENGINE_SCHEDULING':
32-
return <Tooltip title={tooltipTitles.ENGINE_SCHEDULING}><LoadingOutlined spin/></Tooltip>;
46+
return <Tooltip title={tooltipTitles.ENGINE_SCHEDULING}>
47+
<IconWrapper><LoadingOutlined spin/></IconWrapper>
48+
</Tooltip>;
3349
case 'ENGINE_RUNNING':
34-
return <Tooltip title={tooltipTitles.ENGINE_RUNNING}><LoadingOutlined spin /></Tooltip>;
50+
return <Tooltip title={tooltipTitles.ENGINE_RUNNING}>
51+
<IconWrapper><LoadingOutlined spin /></IconWrapper>
52+
</Tooltip>;
3553
case null:
36-
return <Tooltip title={tooltipTitles.null}><CheckCircleTwoTone twoToneColor="#52c41a" /></Tooltip>;
54+
return <Tooltip title={tooltipTitles.null}>
55+
<IconWrapper><CheckCircleTwoTone twoToneColor="#52c41a" /></IconWrapper>
56+
</Tooltip>;
3757
default:
38-
return <Tooltip title={tooltipTitles.default}><InfoCircleTwoTone /></Tooltip>;
58+
return <Tooltip title={tooltipTitles.default}>
59+
<IconWrapper><InfoCircleTwoTone /></IconWrapper>
60+
</Tooltip>;
3961
}
4062
}
4163

app/client/src/constants.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ export const LABELS = {
88
[Pages.GENERATOR]: 'Generation',
99
[Pages.EVALUATOR]: 'Evaluator',
1010
[Pages.DATASETS]: 'Datasets',
11+
[Pages.EVALUATIONS]: 'Evaluations',
12+
[Pages.EXPORTS]: 'Exports',
1113
[Pages.HISTORY]: 'History',
1214
[Pages.FEEDBACK]: 'Feedback',
1315
//[Pages.TELEMETRY]: 'Telemetry',
@@ -19,7 +21,11 @@ export const LABELS = {
1921

2022
export const TRANSLATIONS: Record<string, string> = {
2123
"code_generation": "Code Generation",
22-
"text2sql": "Text to SQL"
24+
"text2sql": "Text to SQL",
25+
"custom": "Custom",
26+
"lending_data": "Lending Data",
27+
"credit_card_data": "Credit Card Data",
28+
"ticketing_dataset": "Ticketing Dataset"
2329
};
2430

2531
export const CDSW_PROJECT_URL = import.meta.env.VITE_CDSW_PROJECT_URL;

app/client/src/pages/DataGenerator/Configure.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ModelProviders, ModelProvidersDropdownOpts } from './types';
1111
import { getWizardModel, getWizardModeType, useWizardCtx } from './utils';
1212
import FileSelectorButton from './FileSelectorButton';
1313
import UseCaseSelector from './UseCaseSelector';
14-
import { useLocation } from 'react-router-dom';
14+
import { useLocation, useParams } from 'react-router-dom';
1515
import { WizardModeType } from '../../types';
1616
import { get } from 'lodash';
1717

@@ -52,6 +52,7 @@ export const MODEL_TYPE_OPTIONS: ModelProvidersDropdownOpts = [
5252

5353
const Configure = () => {
5454
const location = useLocation();
55+
const { template_name, generate_file_name } = useParams();
5556
const [wizardModeType, setWizardModeType] = useState(getWizardModeType(location));
5657

5758
useEffect(() => {
@@ -64,6 +65,12 @@ const Configure = () => {
6465
}
6566
}, [location, wizardModeType]);
6667

68+
useEffect(() => {
69+
if (template_name) {
70+
form.setFieldValue('use_case', template_name);
71+
}
72+
}, [template_name]);
73+
6774
const form = Form.useFormInstance();
6875
const formData = Form.useWatch((values) => values, form);
6976
const { setIsStepValid } = useWizardCtx();
@@ -91,7 +98,7 @@ const Configure = () => {
9198

9299
// keivan
93100
useEffect(() => {
94-
if (formData && formData?.inference_type === undefined) {
101+
if (formData && formData?.inference_type === undefined && isEmpty(generate_file_name)) {
95102
form.setFieldValue('inference_type', ModelProviders.CAII);
96103
}
97104
}, [formData]);
@@ -290,7 +297,7 @@ const Configure = () => {
290297
>
291298
<Flex>
292299
<Select placeholder={'Select project files'} mode="multiple" value={selectedFiles || []} onChange={onFilesChange} allowClear/>
293-
<FileSelectorButton onAddFiles={onAddFiles} workflowType={form.getFieldValue('workflow_type')} />
300+
<FileSelectorButton onAddFiles={onAddFiles} workflowType={form.getFieldValue('workflow_type')} allowFileTypes={['pdf', 'docx']}/>
294301
</Flex>
295302
</Form.Item>}
296303
{formData?.workflow_type === WorkflowType.CUSTOM_DATA_GENERATION &&

0 commit comments

Comments
 (0)