Skip to content

Commit b39d620

Browse files
htahir1htahir1
authored
Merge pull request #105 from zenml-io/dev
Dev
2 parents 3b90059 + 4d9f838 commit b39d620

File tree

7 files changed

+159
-102
lines changed

7 files changed

+159
-102
lines changed

‎src/redux/reducers/runsReducer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ const newState = (state: State, runs: TRun[], pagination?: any): State => ({
5959
ids: idsInsert(state.ids, runs),
6060
byId: byKeyInsert(state.byId, runs),
6161
paginated: {
62-
page: pagination.page,
63-
size: pagination.size,
64-
totalPages: pagination.total_pages,
65-
totalitem: pagination.total,
62+
page: pagination?.page,
63+
size: pagination?.size,
64+
totalPages: pagination?.total_pages,
65+
totalitem: pagination?.total,
6666
},
6767
});
6868
const newStateForGraph = (state: State, graph: any): State => ({

‎src/ui/components/forms/index.tsx‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -178,26 +178,28 @@ export const SearchInputField = (
178178
return (
179179
<FlexBox.Column fullWidth style={{ height: '100px' }}>
180180
<FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
181-
182-
<LinkBox style={{ position: 'absolute', left: '7px', top: '30px' }} onClick={() => {}}>
181+
<LinkBox
182+
style={{ position: 'absolute', left: '7px', top: '30px' }}
183+
onClick={() => {}}
184+
>
183185
<icons.search color={iconColors.grey} />
184-
</LinkBox>
185-
186-
<InputWithLabel
187-
name={props.name}
188-
label={props.label}
189-
labelColor={props.labelColor}
190-
InputComponent={
191-
<TextInput
192-
{...props}
193-
style={{ paddingLeft: '40px' }}
194-
value={props.value}
195-
onChangeText={props.onChange}
196-
placeholder={props.placeholder}
197-
/>
198-
}
199-
/>
186+
</LinkBox>
200187

188+
<InputWithLabel
189+
name={props.name}
190+
label={props.label}
191+
labelColor={props.labelColor}
192+
InputComponent={
193+
<TextInput
194+
type="search"
195+
{...props}
196+
style={{ paddingLeft: '40px' }}
197+
value={props.value}
198+
onChangeText={props.onChange}
199+
placeholder={props.placeholder}
200+
/>
201+
}
202+
/>
201203
</FlexBox>
202204
</FlexBox.Column>
203205
);

‎src/ui/layouts/settings/Organization/useHeaderCols.tsx‎

Lines changed: 77 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import { UpdateMember } from './UpdateMember';
1818
import { TokenPopup } from './tokenPopup';
1919
import ReactTooltip from 'react-tooltip';
2020
import { Sorting, SortingDirection } from './ForSorting/types';
21-
import { SortingHeader } from './ForSorting/SortingHeader';
21+
// import { SortingHeader } from './ForSorting/SortingHeader';
2222
import { useService } from './ForSorting/useServiceForSorting';
23-
import _ from 'lodash';
23+
// import _ from 'lodash';
2424

2525
export const useInviteHeaderCols = (): HeaderCol[] => {
2626
return [
@@ -98,25 +98,26 @@ export const useMemberHeaderCols = ({
9898
activeSortingDirection,
9999
filteredMembers,
100100
});
101+
console.log(sortMethod);
101102

102103
return [
103104
{
104105
render: () => (
105-
<SortingHeader
106-
sorting="name"
107-
sortMethod={sortMethod('name', {
108-
asc: (filteredMembers: TMember[]) =>
109-
_.orderBy(filteredMembers, ['name'], ['asc']),
110-
desc: (filteredMembers: TMember[]) =>
111-
_.orderBy(filteredMembers, ['name'], ['desc']),
112-
})}
113-
activeSorting={activeSorting}
114-
activeSortingDirection={activeSortingDirection}
115-
>
116-
<Paragraph size="small" style={headColStyle}>
117-
{translate('table.member.text')}
118-
</Paragraph>
119-
</SortingHeader>
106+
// <SortingHeader
107+
// sorting="name"
108+
// sortMethod={sortMethod('name', {
109+
// asc: (filteredMembers: TMember[]) =>
110+
// _.orderBy(filteredMembers, ['name'], ['asc']),
111+
// desc: (filteredMembers: TMember[]) =>
112+
// _.orderBy(filteredMembers, ['name'], ['desc']),
113+
// })}
114+
// activeSorting={activeSorting}
115+
// activeSortingDirection={activeSortingDirection}
116+
// >
117+
<Paragraph size="small" style={headColStyle}>
118+
{translate('table.member.text')}
119+
</Paragraph>
120+
// </SortingHeader>
120121
),
121122
width: '12%',
122123
renderRow: (member: TMember) => {
@@ -175,52 +176,56 @@ export const useMemberHeaderCols = ({
175176
),
176177
},
177178
{
178-
render: () => (<Paragraph size="small" style={headColStyle}>Roles</Paragraph>),
179+
render: () => (
180+
<Paragraph size="small" style={headColStyle}>
181+
Roles
182+
</Paragraph>
183+
),
179184
width: '15%',
180185
renderRow: (member: TMember) => {
181186
const role = member?.roles?.map((e) => {
182-
return e.name
183-
})
184-
187+
return e.name;
188+
});
189+
185190
return (
186-
<FlexBox alignItems="center">
187-
<Paragraph size="small">
188-
<Paragraph>{role?.toString()}</Paragraph>
189-
</Paragraph>
191+
<FlexBox alignItems="center">
192+
<Paragraph size="small">
193+
<Paragraph>{role?.toString()}</Paragraph>
194+
</Paragraph>
190195
</FlexBox>
191-
)
192-
}
196+
);
197+
},
193198
},
194199
{
195200
render: () => (
196-
<SortingHeader
197-
sorting="created"
198-
sortMethod={sortMethod('created', {
199-
asc: (filteredMembers: any[]) =>
200-
_.orderBy(
201-
filteredMembers,
202-
(member: any) => new Date(member?.created).getTime(),
203-
['asc'],
204-
),
205-
desc: (filteredMembers: any[]) =>
206-
_.orderBy(
207-
filteredMembers,
208-
(member: any) => new Date(member?.created).getTime(),
209-
['desc'],
210-
),
211-
})}
212-
activeSorting={activeSorting}
213-
activeSortingDirection={activeSortingDirection}
214-
>
215-
<Paragraph size="small" style={headColStyle}>
216-
{translate('table.createdAt.text')}
217-
</Paragraph>
218-
</SortingHeader>
201+
// <SortingHeader
202+
// sorting="created"
203+
// sortMethod={sortMethod('created', {
204+
// asc: (filteredMembers: any[]) =>
205+
// _.orderBy(
206+
// filteredMembers,
207+
// (member: any) => new Date(member?.created).getTime(),
208+
// ['asc'],
209+
// ),
210+
// desc: (filteredMembers: any[]) =>
211+
// _.orderBy(
212+
// filteredMembers,
213+
// (member: any) => new Date(member?.created).getTime(),
214+
// ['desc'],
215+
// ),
216+
// })}
217+
// activeSorting={activeSorting}
218+
// activeSortingDirection={activeSortingDirection}
219+
// >
220+
<Paragraph size="small" style={headColStyle}>
221+
{translate('table.createdAt.text')}
222+
</Paragraph>
223+
// </SortingHeader>
219224
),
220225
width: '13%',
221-
renderRow: (member: TMember) => (
226+
renderRow: (member: TMember) => (
222227
<FlexBox alignItems="center">
223-
<div data-tip data-for={formatDateToDisplayOnTable(member?.created)}>
228+
<div data-tip data-for={formatDateToDisplayOnTable(member?.created)}>
224229
<FlexBox alignItems="center">
225230
<Box paddingRight="sm">
226231
<icons.calendar color={iconColors.grey} size={iconSizes.sm} />
@@ -235,36 +240,38 @@ export const useMemberHeaderCols = ({
235240
place="top"
236241
effect="solid"
237242
>
238-
<Paragraph color="white">{formatDateToDisplayOnTable(member?.created)}</Paragraph>
243+
<Paragraph color="white">
244+
{formatDateToDisplayOnTable(member?.created)}
245+
</Paragraph>
239246
</ReactTooltip>
240247
</FlexBox>
241-
)
248+
),
242249
},
243250
{
244251
render: () => <Paragraph size="small"></Paragraph>,
245-
width: decoded.permissions.includes('write') ? '5%' :'0%',
252+
width: decoded.permissions.includes('write') ? '5%' : '0%',
246253
renderRow: (member: any) => (
247254
<FlexBox alignItems="center">
248255
{decoded.permissions.includes('write') && (
249-
<>
250-
<FlexBox >
251-
<div data-tip data-for={member?.id}>
252-
<UpdateMember member={member} />
253-
</div>
254-
</FlexBox>
256+
<>
257+
<FlexBox>
258+
<div data-tip data-for={member?.id}>
259+
<UpdateMember member={member} />
260+
</div>
261+
</FlexBox>
255262

256-
<FlexBox>
257-
<div data-tip data-for={member?.id}>
258-
<DeleteMember member={member} />
259-
</div>
260-
{/* <ReactTooltip id={member.id} place="top" effect="solid">
263+
<FlexBox>
264+
<div data-tip data-for={member?.id}>
265+
<DeleteMember member={member} />
266+
</div>
267+
{/* <ReactTooltip id={member.id} place="top" effect="solid">
261268
<Paragraph color="white">Delete Member</Paragraph>
262269
</ReactTooltip> */}
263-
</FlexBox>
264-
</>
270+
</FlexBox>
271+
</>
265272
)}
266273
</FlexBox>
267-
)
268-
}
274+
),
275+
},
269276
];
270277
};

‎src/ui/layouts/stackComponents/Component.tsx‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,46 @@ const Component = () => {
401401
</Box>
402402
</FlexBox>
403403
)}
404+
{console.log(item, 'item')}
405+
{item !== 'data_validator' &&
406+
item !== 'step_operator' &&
407+
item !== 'orchestrator' &&
408+
item !== 'secrets_manager' &&
409+
item !== 'model_deployer' &&
410+
item !== 'model_deployer' &&
411+
item !== 'feature_store' &&
412+
item !== 'experiment_tracker' &&
413+
item !== 'container_registry' &&
414+
item !== 'annotator' &&
415+
item !== 'alerter' &&
416+
item !== 'artifact_store' && (
417+
<FlexBox
418+
onClick={() => selectSection(item)}
419+
style={{
420+
...sectionStyle,
421+
background: formatSectionColor(item),
422+
}}
423+
marginTop="sm"
424+
>
425+
<Box>
426+
<icons.stackComponent
427+
color={
428+
selectedComp === item
429+
? iconColors.white
430+
: iconColors.primary
431+
}
432+
size={iconSizes.md}
433+
/>
434+
</Box>
435+
<Box>
436+
<Paragraph
437+
style={{ color: formatTextColor(item), ...textStyle }}
438+
>
439+
{formatText(item)}
440+
</Paragraph>
441+
</Box>
442+
</FlexBox>
443+
)}
404444
</Box>
405445
))}
406446
</Box>

‎src/ui/layouts/stackComponents/Stacks/List/ForSorting/SortingHeader.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@ import { Sorting, SortingDirection } from './types';
66
import styles from './index.module.scss';
77

88
export const SortingHeader: React.FC<{
9+
onlyOneRow?: boolean;
910
sortMethod: void;
1011
activeSorting: Sorting | null;
1112
activeSortingDirection: SortingDirection | null;
1213
sorting: Sorting;
1314
}> = ({
15+
onlyOneRow,
1416
children,
1517
sortMethod,
1618
activeSorting,
1719
activeSortingDirection,
1820
sorting,
1921
}) => {
20-
return (
22+
return onlyOneRow ? (
23+
<>{children}</>
24+
) : (
2125
<LinkBox className={styles.sortingBox} onClick={sortMethod}>
2226
<FlexBox alignItems="center">
2327
{children}

0 commit comments

Comments
 (0)