Skip to content

Commit 2627fb6

Browse files
committed
fixes
1 parent be4b29e commit 2627fb6

File tree

8 files changed

+35
-31
lines changed

8 files changed

+35
-31
lines changed

src/ui/components/Filters/index.tsx

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
Box,
44
FlexBox,
55
FormDropdownField,
6+
SearchInputField,
67
FormTextField,
78
icons,
89
Paragraph,
@@ -644,24 +645,18 @@ const FilterComponent = ({
644645
return (
645646
<FlexBox.Column fullWidth>
646647
<div className={styles.inputRow}>
647-
<Box marginBottom="lg" marginRight="md">
648-
<FormTextField
649-
label={''}
650-
placeholder={'Search'}
651-
value={searchText ? filters[0]?.filterValue : ''}
652-
disabled={applyFilter}
653-
onChange={(value: string) => {
654-
setSearchText(value ? true : false);
655-
handleValueFieldChangeOnSearch(value);
656-
}}
657-
style={{
658-
borderRadius: '4px',
659-
width: '205px',
660-
fontSize: '12px',
661-
color: '#424240',
662-
}}
648+
<Box marginRight="md" marginTop='md'>
649+
<SearchInputField
650+
placeholder={'Search'}
651+
value={searchText ? filters[0]?.filterValue : ''}
652+
disabled={applyFilter}
653+
onChange={(value: string) => {
654+
setSearchText(value ? true : false);
655+
handleValueFieldChangeOnSearch(value);
656+
}}
663657
/>
664658
</Box>
659+
665660
<FlexBox
666661
fullWidth
667662
className="border border-primary rounded rounded-4 p-2 align-item-center"
@@ -673,14 +668,14 @@ const FilterComponent = ({
673668
style={{
674669
width: '33px',
675670
height: '28px',
676-
background: '#431D93',
671+
background: '#fff',
677672
borderRadius: '4px',
678673
}}
679674
>
680675
<icons.funnelFill
681676
style={{ padding: '5px 0px 0px 7px' }}
682677
size={iconSizes.sm}
683-
color={iconColors.white}
678+
color={iconColors.primary}
684679
/>
685680
</Box>
686681
<Box
Lines changed: 6 additions & 0 deletions
Loading

src/ui/components/icons/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import { ReactComponent as LockKey } from './assets/LockKey.svg';
5757
import { ReactComponent as Graph } from './assets/Graph.svg';
5858
import { ReactComponent as GitCommit } from './assets/GitCommit.svg';
5959
import { ReactComponent as ChatDots } from './assets/ChatDots.svg';
60+
import { ReactComponent as Run } from './assets/Run.svg';
6061
// import { ReactComponent as Inprogress } from './assets/InProgress.svg';
6162
// import { ReactComponent as Cached } from './assets/Cached.svg';
6263
// import { ReactComponent as RightArrow } from './assets/RightArrow.svg';
@@ -169,6 +170,7 @@ const icons = {
169170
delete: createIcon({ Component: Delete }),
170171
edit: createIcon({ Component: Edit }),
171172
search: createIcon({ Component: Search }),
173+
run: createIcon({ Component: Run, useStroke: true }),
172174

173175
//icons for stackComponents
174176
artifact_store: createIcon({ Component: Folders, useStroke: true }),

src/ui/components/typographies/index.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
.baseParagraph {
3333
font-family: $fontFamilyNormal;
34-
color: #828282;
34+
color: #424240;
3535
word-wrap: break-word;
3636
margin: 0;
3737
}

src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedHeader.module.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ $width: 15rem;
2727
z-index: 9;
2828
top: 5rem;
2929
right: 0;
30+
text-align: end;
3031
}
3132

3233
.popupItem {
3334
cursor: pointer;
3435
transition: 0.2s ease-in all;
36+
justify-content: end;
3537
}
3638

3739
.popupItem:hover {

src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedHeader.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
import { getInitials } from '../../../../../utils/name';
2121
import {
2222
DEFAULT_FULL_NAME,
23-
DEFAULT_PROJECT_NAME,
2423
} from '../../../../../constants';
2524
import OutsideClickHandler from 'react-outside-click-handler';
2625
import {
@@ -157,13 +156,13 @@ export const AuthenticatedHeader: React.FC<{
157156
onFailure: () => stopLoad(),
158157
}),
159158
);
160-
await dispatch(projectsActions.getMy({ selectDefault: false, selectedProject }))
159+
await dispatch(projectsActions.getMy({ selectDefault: false, selectedProject: e?.name }))
161160
};
162161

162+
const selected = projects.some((project) => project['name'] === locationPath.split('/')[2])
163+
? locationPath.split('/')[2].substring(0, 10)
164+
: selectedProject
163165

164-
const selected = projects.some((project) => project['name'] === locationPath.split('/')[2])
165-
? locationPath.split('/')[2].substring(0, 10)
166-
: DEFAULT_PROJECT_NAME.substring(0, 10)
167166

168167
return (
169168
<>
@@ -207,7 +206,7 @@ const selected = projects.some((project) => project['name'] === locationPath.sp
207206
</FlexBox>
208207
</LinkBox>
209208
<If condition={popupOpen}>
210-
{() => (
209+
{() => (
211210
<OutsideClickHandler
212211
onOutsideClick={() => setPopupOpen(false)}
213212
>
@@ -217,7 +216,6 @@ const selected = projects.some((project) => project['name'] === locationPath.sp
217216
className={styles.popupItem}
218217
paddingHorizontal="md"
219218
paddingVertical="sm"
220-
alignItems="center"
221219
>
222220
<Paragraph size="small">Settings</Paragraph>
223221
</FlexBox>
@@ -227,13 +225,13 @@ const selected = projects.some((project) => project['name'] === locationPath.sp
227225
<Box marginHorizontal='md'><Separator.LightNew /></Box>
228226
<Box marginTop='sm' marginHorizontal="md" ><Paragraph color='grey' style={{ fontSize: '14px' }} >Your workspaces</Paragraph></Box>
229227

230-
<Box marginVertical='sm' marginLeft='md' className="d-none d-md-block">
228+
<Box marginVertical='sm' marginHorizontal='md' className="d-none d-md-block">
231229
<Box marginTop='sm' style={{ maxHeight: '290px', overflow: projects?.length > 10 ? 'auto' :'hidden' }} >
232230
{projects.map((option, index) => (
233231
<Box marginTop='sm' onClick={() => onChange(option) } key={index} >
234232
<div data-tip data-for={option.name}>
235233
<Paragraph style={{ fontSize: '16px', color: '#443E99', cursor: 'pointer', fontWeight: selected === option.name ? 'bold' : 'normal' }} >
236-
{option.name.substring(0, 10)} {selected === option.name && <>&#x2022;</>}
234+
{option.name.substring(0, 10)} <span style={{ color: selected === option.name ? '#443E99' : '#fff' }} >&#x2022;</span>
237235
</Paragraph>
238236
</div>
239237

@@ -254,7 +252,7 @@ const selected = projects.some((project) => project['name'] === locationPath.sp
254252
className={styles.popupItem}
255253
paddingHorizontal="md"
256254
paddingVertical="sm"
257-
alignItems="center"
255+
// alignItems="center"
258256
>
259257
<Box paddingRight="sm">
260258
<icons.signOut

src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedSidebar/Menu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const Menu: React.FC = () => {
4040
<MenuItem
4141
id="runs"
4242
Icon={() => (
43-
<icons.pipeline color={iconColors.white} size={iconSizes.md} />
43+
<icons.run color={iconColors.white} size={iconSizes.md} />
4444
)}
4545
to={routePaths.pipelines.allRuns(selectedProject)}
4646
isActive={() => window.location.href?.includes('all-runs')}

src/ui/layouts/stackComponents/Component.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ const Component = () => {
3939
})
4040

4141
const formatText = (text: string) => {
42-
return text.charAt(0).toUpperCase() + text.slice(1).replace('_', ' ')
42+
const removeUnderscore = text.replace('_', ' ')
43+
return removeUnderscore.replace(/(^\w{1})|(\s+\w{1})/g, letter => letter.toUpperCase());
4344
}
4445

4546
const formatSectionColor = (text: string) => {

0 commit comments

Comments
 (0)