Skip to content

Commit 666175f

Browse files
zivglikzivglik
committed
fix Merge branch 'master' into Error-log-filter
2 parents 9d8d817 + f05b5a5 commit 666175f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+882
-285
lines changed

‎package-lock.json‎

Lines changed: 5 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simulator",
3-
"version": "2.4.4",
3+
"version": "2.5.6",
44
"description": "The Hkube Dashboard",
55
"private": true,
66
"homepage": ".",

‎src/Routes/Base/Header/Settings/Settings.react.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import React from 'react';
33
import GraphDirection from './GraphDirection.react';
44
import LogSource from './LogSource.react';
55
import LogMode from './LogMode.react';
6-
import TypesSelect from './TypesSelect.react';
6+
// import TypesSelect from './TypesSelect.react';
77

88
const Settings = () => (
99
<FlexBox.Auto direction="column" gutter={[10, 10]}>
1010
<GraphDirection />
1111
<LogSource />
1212
<LogMode />
13-
<TypesSelect />
13+
{/* <TypesSelect /> */}
1414
</FlexBox.Auto>
1515
);
1616

‎src/Routes/Base/Header/TagsFiltersViews.js‎

Lines changed: 59 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import { Tag } from 'antd';
2-
import { instanceFiltersVar, metaVar } from 'cache';
2+
import { instanceFiltersVar, metaVar, isPinActiveJobVar } from 'cache';
33
import { useReactiveVar } from '@apollo/client';
44
import React, { useEffect } from 'react';
55
import PropTypes from 'prop-types';
66

77
// import { Route, useHistory, useLocation } from 'react-router-dom';
88
import { useHistory, useLocation } from 'react-router-dom';
99
import qs from 'qs';
10-
import moment from 'moment';
1110

12-
// import { isNaN } from 'lodash';
13-
14-
const FORMAT_DATE_TIME = 'MM-DD-YYYY HH:mm';
1511
const TagsFiltersViews = ({ sectionName }) => {
1612
const instanceFilters = useReactiveVar(instanceFiltersVar);
13+
const isPinActiveJobs = useReactiveVar(isPinActiveJobVar);
1714
const metaMode = useReactiveVar(metaVar);
1815

1916
const history = useHistory();
@@ -23,12 +20,10 @@ const TagsFiltersViews = ({ sectionName }) => {
2320
const closeFilter = key => {
2421
const resetKey = { ...instanceFiltersVar() };
2522

26-
if (key === 'datesRange') {
27-
resetKey[sectionName][key].from = null;
28-
resetKey[sectionName][key].to = null;
29-
} else {
30-
resetKey[sectionName][key] = null;
31-
}
23+
if (key === 'datesRange.from') resetKey[sectionName].datesRange.from = null;
24+
else if (key === 'datesRange.to')
25+
resetKey[sectionName].datesRange.to = null;
26+
else resetKey[sectionName][key] = null;
3227

3328
instanceFiltersVar(resetKey);
3429
};
@@ -59,7 +54,15 @@ const TagsFiltersViews = ({ sectionName }) => {
5954
// },[])
6055

6156
useEffect(() => {
62-
const _qParams = qs.stringify(instanceFilters[sectionName], {
57+
// write query string params
58+
const paramsToUrl = { ...instanceFilters[sectionName] };
59+
60+
if (sectionName === 'jobs') {
61+
delete paramsToUrl.datesRange;
62+
isPinActiveJobs && delete paramsToUrl.pipelineStatus;
63+
}
64+
65+
const _qParams = qs.stringify(paramsToUrl, {
6366
ignoreQueryPrefix: true,
6467
allowDots: true,
6568
skipNulls: true,
@@ -75,31 +78,48 @@ const TagsFiltersViews = ({ sectionName }) => {
7578
});
7679
}, [history, instanceFilters, sectionName, urlParams.pathname]);
7780

78-
const cancelPropFilter = ['experimentName', 'limit'];
79-
return (
80-
propFilters &&
81+
const cancelPropFilter = ['datesRange', 'experimentName', 'limit'];
82+
83+
if (isPinActiveJobs) {
84+
cancelPropFilter.push('pipelineStatus');
85+
}
86+
87+
const allTags = [];
88+
propFilters &&
8189
Object.entries(propFilters).map(([key, value]) => {
8290
if (!cancelPropFilter.includes(key)) {
83-
if (key === 'datesRange' && value) {
84-
return (
85-
value?.from &&
86-
value?.to && (
87-
<Tag
88-
title={key}
89-
key={key}
90-
closable
91-
onClose={() => {
92-
closeFilter(key);
93-
}}>
94-
{moment(value.from).format(FORMAT_DATE_TIME)} -{' '}
95-
{moment(value.to).format(FORMAT_DATE_TIME)}
96-
</Tag>
97-
)
98-
);
99-
}
100-
101-
return (
102-
value && (
91+
/* if (key === 'datesRange') {
92+
93+
if (value?.from) {allTags.push( <Tag
94+
title={`${key}from`}
95+
key={`${key}from`}
96+
closable
97+
onClose={() => {
98+
closeFilter(`${key}.from`);
99+
}}>
100+
{moment(value.from).utc().format(FORMAT_DATE_TIME)}
101+
102+
</Tag>)}
103+
104+
105+
106+
if(value?.to) {
107+
allTags.push( <Tag
108+
title={`${key}to`}
109+
key={`${key}to`}
110+
closable
111+
onClose={() => {
112+
closeFilter(`${key}.to`);
113+
}}>
114+
{moment(value.to).utc().format(FORMAT_DATE_TIME)}
115+
116+
</Tag>)
117+
118+
}
119+
}
120+
else */
121+
if (value) {
122+
allTags.push(
103123
<Tag
104124
title={key}
105125
key={key}
@@ -109,13 +129,13 @@ const TagsFiltersViews = ({ sectionName }) => {
109129
}}>
110130
{value}
111131
</Tag>
112-
)
113-
);
132+
);
133+
}
114134
}
115135

116136
return null;
117-
})
118-
);
137+
});
138+
return allTags;
119139
};
120140
TagsFiltersViews.propTypes = {
121141
sectionName: PropTypes.string.isRequired,

‎src/Routes/Base/SidebarLeft/index.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,15 @@ const SidebarLeft = () => {
152152
</LogoContainer>
153153
<MenuMargin selectedKeys={[`left-sidebar-${pageName}`]}>
154154
{menuItems.map(([name, component, path]) => {
155-
const isFilters = isValuesFiltersEmpty(instanceFilters[name]);
155+
const filterList = { ...instanceFilters[name] };
156+
157+
if (name === 'jobs') {
158+
delete filterList.datesRange; // not show filter when select time
159+
delete filterList.experimentName;
160+
}
161+
162+
const isFilters = isValuesFiltersEmpty(filterList);
163+
156164
return (
157165
<Menu.Item
158166
key={`left-sidebar-${name}`}

‎src/Routes/SidebarRight/AddPipeline/Steps/Initial/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const Initial = ({ style }) => {
5757
</Select>
5858
</Form.Item>
5959

60-
<Form.Item label="Debugged Nodes" name={['debugOverride']}>
60+
<Form.Item label="Debugged Nodes" name={['options', 'debugOverride']}>
6161
<Select
6262
mode="multiple"
6363
allowClear

‎src/Routes/SidebarRight/AddPipeline/Steps/Nodes/DataSource.js‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const RadioGroup = styled(Radio.Group)`
2828
`;
2929

3030
const DataSourceNode = ({ id }) => {
31-
const { form, initialState } = useWizardContext();
31+
const { form, initialState, setForm } = useWizardContext();
3232

33-
const { dataSources: collection } = useDataSources();
33+
const { sortedDataSources: collection } = useDataSources();
3434

3535
const [mode, setMode] = useState(
3636
initialState?.nodes[id]?.spec?.snapshot
@@ -44,22 +44,28 @@ const DataSourceNode = ({ id }) => {
4444
const { versionsCollection } = useVersions({ name: activeName });
4545
const { snapshots } = useSnapshots({ dataSourceName: activeName });
4646

47-
const handleChangeMode = useCallback(e => setMode(e.target.value), []);
47+
// eslint-disable-next-line react-hooks/exhaustive-deps
48+
const handleChangeMode = useCallback(e => {
49+
setTimeout(() => {
50+
setForm();
51+
}, 500);
4852

49-
const disableSnapshot = useMemo(() => snapshots?.length === 0 || true, [
53+
return setMode(e.target.value);
54+
});
55+
const disableSnapshot = useMemo(() => snapshots?.length === 0, [
5056
snapshots?.length,
5157
]);
5258

53-
const disableVersions = useMemo(() => !versionsCollection?.versions || true, [
54-
versionsCollection?.versions,
59+
const disableVersions = useMemo(() => versionsCollection?.length === 0, [
60+
versionsCollection?.length,
5561
]);
5662

5763
return (
5864
<ctx.Provider value={{ rootId: ['nodes', id, 'spec'] }}>
5965
<Field name={['name']} title="DataSource Name">
60-
<Select disabled={collection.length === 0}>
66+
<Select disabled={collection && collection.length === 0}>
6167
{collection.map(({ name }) => (
62-
<Select.Option key={`nodes.${id}.spec.name`} value={name}>
68+
<Select.Option key={`nodes.${id}.spec.name_${name}`} value={name}>
6369
{name}
6470
</Select.Option>
6571
))}
@@ -78,7 +84,7 @@ const DataSourceNode = ({ id }) => {
7884

7985
{mode === MODES.SNAPSHOT ? (
8086
<Field name={['snapshot', 'name']} title="Snapshot Name">
81-
<Select disabled={disableSnapshot}>
87+
<Select disabled={disableSnapshot} allowClear>
8288
{snapshots?.map(entry => (
8389
<Select.Option
8490
key={`nodes.${id}.spec.version.${entry.id}`}
@@ -95,8 +101,8 @@ const DataSourceNode = ({ id }) => {
95101
</Field>
96102
) : mode === MODES.VERSION ? (
97103
<Field name={['dataSource', 'id']} title="Version" skipValidation>
98-
<Select disabled={disableVersions}>
99-
{versionsCollection?.versions.map(entry => (
104+
<Select disabled={disableVersions} allowClear>
105+
{versionsCollection?.versions?.map(entry => (
100106
<Select.Option
101107
key={`nodes.${id}.spec.version.${entry.id}`}
102108
value={entry.id}>

‎src/Routes/Tables/Algorithms/Tabs/Builds/getColumns.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const BuildId = buildId => (
1313
<Ellipsis copyable type="secondary" text={buildId} />
1414
);
1515
const StartTime = startTime => (
16-
<Moment format="DD/MM/YY HH:mm:ss">{startTime}</Moment>
16+
<Moment format="DD/MM/YY HH:mm:ss">{+startTime}</Moment>
1717
);
1818

1919
const Status = status => <BaseTag status={status}>{status}</BaseTag>;

‎src/Routes/Tables/Algorithms/Tabs/Versions/getVersionsColumns.react.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const Mem = mem => <Tag>{mem || 'No Memory Specified'}</Tag>;
4848
const MinHotWorkers = minHotWorkers => <Tag>{minHotWorkers}</Tag>;
4949
const Type = type => <Tag>{type}</Tag>;
5050
const Created = created => (
51-
<Moment format="DD/MM/YY HH:mm:ss">{created}</Moment>
51+
<Moment format="DD/MM/YY HH:mm:ss">{+created}</Moment>
5252
);
5353

5454
const getVersionsColumns = ({ onDelete, onApply, currentVersion }) => {

0 commit comments

Comments
 (0)