Skip to content

Commit 3072ce9

Browse files
committed
Merge branch 'dev' of https://github.com/zenml-io/zenml-dashboard into ahsan/feat/auth-screens
2 parents 943f5b1 + 056ced2 commit 3072ce9

File tree

2 files changed

+81
-19
lines changed

2 files changed

+81
-19
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ jobs:
1313
steps:
1414
- name: Checkout Repository
1515
uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
16+
- name: Get the version from the github tag ref
17+
id: get_version
18+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
1819
- uses: actions/setup-node@v3
1920
with:
2021
node-version: 14.20.0
@@ -27,12 +28,7 @@ jobs:
2728
env:
2829
REACT_APP_BASE_API_URL: "/api/v1"
2930
REACT_APP_MOCKAPI_RESPONSE: false
30-
REACT_APP_VERSION: ${{ github.ref }}
31-
32-
- name: Get the version from the github tag ref
33-
id: get_version
34-
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
35-
31+
REACT_APP_VERSION: ${{ steps.get_version.outputs.VERSION }}
3632
- name: Generate Changelog
3733
uses: heinrichreimer/[email protected]
3834
with:
@@ -43,18 +39,15 @@ jobs:
4339
issuesWoLabels: "true"
4440
stripHeaders: "true"
4541
- name: Create release archive
46-
uses: a7ul/[email protected]
47-
id: compress
48-
with:
49-
command: c
50-
cwd: ./build
51-
files: |
52-
*
53-
outPath: zenml-dashboard.tar.gz
42+
run: |
43+
tar -zcf zenml-dashboard.tar.gz -C build --transform="s#\.\/##" .
44+
sha256sum -b zenml-dashboard.tar.gz > zenml-dashboard.tar.gz.sha256
5445
- name: Release to GitHub
5546
uses: softprops/action-gh-release@v1
5647
with:
57-
files: zenml-dashboard.tar.gz
48+
files: |
49+
zenml-dashboard.tar.gz
50+
zenml-dashboard.tar.gz.sha256
5851
body_path: ./CHANGELOG.md
5952
prerelease: "true"
6053
env:

src/ui/components/Filters/index.tsx

Lines changed: 71 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ export const getInitialFilterStateForRuns = () => {
214214
label: 'Pipeline Name',
215215
type: 'string',
216216
},
217+
{
218+
value: 'status',
219+
label: 'Status',
220+
type: 'status',
221+
},
217222
{
218223
value: 'stackName',
219224
label: 'Stack Name',
@@ -289,6 +294,26 @@ export const getInitialFilterStateForRuns = () => {
289294
label: 'false',
290295
type: 'boolean',
291296
},
297+
{
298+
value: 'completed',
299+
label: 'Completed',
300+
type: 'status',
301+
},
302+
{
303+
value: 'running',
304+
label: 'Running',
305+
type: 'status',
306+
},
307+
{
308+
value: 'failed',
309+
label: 'Failed',
310+
type: 'status',
311+
},
312+
{
313+
value: 'cached',
314+
label: 'Cached',
315+
type: 'status',
316+
},
292317
],
293318
},
294319
filterValue: '',
@@ -386,6 +411,7 @@ const FilterComponent = ({
386411

387412
return (
388413
<FlexBox.Column fullWidth>
414+
{console.log(filters)}
389415
<FlexBox
390416
fullWidth
391417
className="border border-primary rounded rounded-4 p-2 align-item-center mb-3"
@@ -405,9 +431,52 @@ const FilterComponent = ({
405431
color={iconColors.white}
406432
/>
407433
</Box>
434+
{console.log(filters)}
408435
<Box style={{ padding: '5px 0px 0px 7px' }} className="text-muted h5">
409-
{' '}
410-
Filter your stack
436+
{/* Filter your stack */}
437+
{!applyFilter && !filters[0]?.column?.selectedValue?.label
438+
? 'Filter your stack'
439+
: filters[0]?.column?.selectedValue.label && !applyFilter
440+
? filters.map((filter: any, index: number) => {
441+
return (
442+
<FlexBox.Row>
443+
<Box
444+
onClick={() => hanldeDelete(index)}
445+
style={{
446+
width: '33px',
447+
height: '33px',
448+
// background: '#8045FF',
449+
borderRadius: '4px',
450+
}}
451+
>
452+
{`${filter.column.selectedValue.label} ${filter.filterValue}`}
453+
</Box>
454+
</FlexBox.Row>
455+
);
456+
})
457+
: 'Filter your stack'}
458+
{!applyFilter && !filters[0]?.column?.selectedValue?.label ? (
459+
'Filter your stack'
460+
) : filters[0]?.column?.selectedValue.label && !applyFilter ? (
461+
<Box
462+
onClick={() => setFilter([])}
463+
style={{
464+
marginTop: '23px',
465+
width: '130px',
466+
height: '40px',
467+
border: '1px solid #c9cbd0',
468+
borderRadius: '4px',
469+
}}
470+
>
471+
<icons.delete
472+
style={{ padding: '7px 0px 0px 7px' }}
473+
size={iconSizes.md}
474+
color={iconColors.grey}
475+
/>
476+
</Box>
477+
) : (
478+
'Filter your stack'
479+
)}
411480
</Box>
412481
</FlexBox>
413482
{applyFilter && (

0 commit comments

Comments
 (0)