Skip to content

Commit 1f6881e

Browse files
Merge pull request #218 from zenml-io/QA-Fixes
Qa fixes
2 parents d3f8f89 + 3d10e63 commit 1f6881e

File tree

4 files changed

+41
-37
lines changed

4 files changed

+41
-37
lines changed

src/ui/components/Filters/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ const FilterComponent = ({
775775
return (
776776
<FlexBox.Column fullWidth>
777777
<div className={styles.inputRow}>
778-
<Box marginRight="md" marginTop="md">
778+
<Box marginRight="md" marginTop="md" style={{ marginTop: '70px' }}>
779779
<SearchInputField
780780
placeholder={'Search'}
781781
value={searchText ? filters[0]?.filterValue : ''}

src/ui/components/forms/index.tsx

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export const EditField = (
180180
} & any,
181181
): JSX.Element => {
182182
return (
183-
<FlexBox.Column fullWidth >
183+
<FlexBox.Column fullWidth>
184184
<FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
185185
<InputWithLabel
186186
name={props.name}
@@ -208,6 +208,7 @@ export const EditField = (
208208

209209
export const SearchInputField = (
210210
props: {
211+
fromRegisterComponent: boolean;
211212
label?: string;
212213
labelColor?: any;
213214
placeholder: any;
@@ -216,16 +217,32 @@ export const SearchInputField = (
216217
} & any,
217218
): JSX.Element => {
218219
return (
219-
<FlexBox.Column fullWidth style={{ height: '100px', marginTop: '-10px' }}>
220+
<FlexBox.Column
221+
fullWidth
222+
style={{
223+
height: props.fromRegisterComponent ? '50px' : '100px',
224+
marginTop: '-10px',
225+
}}
226+
>
220227
<FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
221228
<LinkBox
222229
style={{ position: 'absolute', left: '7px', top: '35px' }}
223230
onClick={() => {}}
224231
>
225-
<icons.search color={iconColors.grey} />
232+
<icons.search
233+
style={{ position: 'relative', top: '-27px' }}
234+
color={iconColors.grey}
235+
/>
226236
</LinkBox>
227-
228-
<InputWithLabel
237+
<TextInput
238+
type="search"
239+
{...props}
240+
style={{ paddingLeft: '40px' }}
241+
value={props.value}
242+
onChangeText={props.onChange}
243+
placeholder={props.placeholder}
244+
/>
245+
{/* <InputWithLabel
229246
name={props.name}
230247
label={props.label}
231248
labelColor={props.labelColor}
@@ -239,7 +256,7 @@ export const SearchInputField = (
239256
placeholder={props.placeholder}
240257
/>
241258
}
242-
/>
259+
/> */}
243260
</FlexBox>
244261
</FlexBox.Column>
245262
);

src/ui/layouts/common/Tabs/index.tsx

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,21 @@ export const Tabs: React.FC<{ pages: TabPage[]; basePath: string }> = ({
4646
isActive ? styles.activeItem : '',
4747
)}
4848
>
49-
<div
50-
style={{
51-
// backgroundColor: 'red',
52-
height: '35px',
53-
display: 'flex',
54-
justifyContent: 'center',
55-
alignItems: 'center',
56-
}}
57-
>
58-
<div>
59-
<Link className={styles.link} to={page.path}>
60-
<IfElse
61-
condition={isActive}
62-
renderWhenFalse={() => (
63-
<Truncate maxLines={1}>
64-
<Paragraph color="grey">{page.text}</Paragraph>
65-
</Truncate>
66-
)}
67-
renderWhenTrue={() => (
68-
<Truncate maxLines={1}>
69-
<Paragraph color="primary">
70-
{page.text}
71-
</Paragraph>
72-
</Truncate>
73-
)}
74-
/>
75-
</Link>
76-
</div>
77-
</div>
49+
<Link className={styles.link} to={page.path}>
50+
<IfElse
51+
condition={isActive}
52+
renderWhenFalse={() => (
53+
<Truncate maxLines={1}>
54+
<Paragraph color="grey">{page.text}</Paragraph>
55+
</Truncate>
56+
)}
57+
renderWhenTrue={() => (
58+
<Truncate maxLines={1}>
59+
<Paragraph color="primary">{page.text}</Paragraph>
60+
</Truncate>
61+
)}
62+
/>
63+
</Link>
7864
</Box>
7965
);
8066
})}

src/ui/layouts/stackComponents/RegisterComponents/ListForAll/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ export const ListForAll: React.FC<Props> = ({ type }: Props) => {
8181
return (
8282
<>
8383
<FlexBox.Column fullWidth>
84-
<div style={{ marginBottom: '-10px' }}>
84+
<div style={{ marginTop: '17px' }}>
8585
<SearchInputField
86+
fromRegisterComponent={true}
8687
placeholder={'Search'}
8788
value={text}
8889
// disabled={applyFilter || showInBar}

0 commit comments

Comments
 (0)