Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Show Argo Dataflow pipelines in the UI #5742

Merged
merged 117 commits into from
Aug 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
d1311b0
feat: Support Argo Dataflow
alexec Apr 27, 2021
6122e96
ok
alexec Apr 27, 2021
42bbbcc
arrows-alt-h
alexec May 3, 2021
069b143
ok
alexec May 4, 2021
12208c9
Merge branch 'master' into dev-dataflow
alexec May 9, 2021
f9e7985
Merge branch 'master' into dev-dataflow
alexec May 10, 2021
be6c2e1
Merge branch 'master' into dev-dataflow
alexec May 12, 2021
ab70737
Merge branch 'master' into dev-dataflow
alexec May 13, 2021
77c0da1
ok
alexec May 14, 2021
3880360
Merge branch 'master' into dev-dataflow
alexec May 14, 2021
a95cd78
ok
alexec May 14, 2021
64888a0
ok
alexec May 14, 2021
61b251b
ok
alexec May 14, 2021
7acc75f
docs: updated CHANGELOG.md (#5921)
github-actions[bot] May 14, 2021
857f6b3
fix: make codegen
alexec May 15, 2021
503c354
feat: add expand and flatten
alexec May 17, 2021
2eea1e5
chore: make pre-commit
alexec May 17, 2021
22689f0
Merge branch 'master' into dev-dataflow
alexec May 17, 2021
9ed42fb
feat: upgrade to dataflow v0.0.10
alexec May 18, 2021
2be8c93
feat: update HTTP names
alexec May 18, 2021
829195f
chore: lint
alexec May 18, 2021
dcf3c98
fix: correct logId
alexec May 18, 2021
eee4ff2
Merge branch 'master' into dev-dataflow
alexec May 19, 2021
3e376cb
fix: upgrade to v0.0.16
alexec May 19, 2021
f219e12
ok
alexec May 20, 2021
3e564e1
fix: upgrade to v0.0.19
alexec May 20, 2021
a4c8d31
ok
alexec May 21, 2021
9d3cd98
ok
alexec May 21, 2021
164a077
Merge branch 'master' into dev-dataflow
alexec May 21, 2021
160b093
ok
alexec May 21, 2021
a96b8d6
ok
alexec May 21, 2021
b0983a7
Merge branch 'master' into dev-dataflow
alexec May 25, 2021
4909621
ok
alexec May 27, 2021
bd89db6
Merge branch 'master' into dev-dataflow
alexec May 27, 2021
7e9b5c9
ci: rate
alexec May 30, 2021
f3325f8
Merge branch 'master' into dev-dataflow
alexec Jun 1, 2021
645bc4f
ok
alexec Jun 1, 2021
3725334
fix(ui): Correct error symbol to use lastError, not lastMessage
alexec Jun 1, 2021
9059a58
fix(ui): rate/recency fixs
alexec Jun 1, 2021
8434197
ok
alexec Jun 1, 2021
ac53be2
Merge branch 'master' into dev-dataflow
alexec Jun 3, 2021
697ebb9
ok
alexec Jun 4, 2021
82c4adc
ok
alexec Jun 4, 2021
37331b8
ok
alexec Jun 4, 2021
301a1cf
Merge branch 'master' into dev-dataflow
alexec Jun 4, 2021
3445338
ok
alexec Jun 4, 2021
366265a
fix(ui): correct rate in graph
alexec Jun 4, 2021
f2fee3f
Merge branch 'master' into dev-dataflow
alexec Jun 6, 2021
c7c16eb
chore: improve logs
alexec Jun 6, 2021
a28875e
Merge branch 'master' into dev-dataflow
alexec Jun 8, 2021
c2e8f66
Merge branch 'master' into dev-dataflow
alexec Jun 8, 2021
0fbae1b
ok
alexec Jun 8, 2021
e93fa45
ok
alexec Jun 10, 2021
232664d
Merge branch 'master' into dev-dataflow
alexec Jun 10, 2021
deffecb
update version
alexec Jun 10, 2021
94c8c25
feat(ui): do not show rate if no rate
alexec Jun 10, 2021
9e3ea5c
Merge branch 'master' into dev-dataflow
alexec Jun 10, 2021
4998d4c
Merge branch 'master' into dev-dataflow
alexec Jun 10, 2021
14a1862
Merge branch 'master' into dev-dataflow
alexec Jun 15, 2021
4c6e40d
ok
alexec Jun 15, 2021
2f35f3b
ok
alexec Jun 15, 2021
55ac894
ok
alexec Jun 15, 2021
59d875d
Merge branch 'master' into dev-dataflow
alexec Jun 17, 2021
86c5cde
ok
alexec Jun 21, 2021
b7e5ff0
Merge branch 'master' into dev-dataflow
alexec Jun 21, 2021
d5483df
ok
alexec Jun 21, 2021
03de508
dedupe
alexec Jun 23, 2021
bf7320f
Merge branch 'master' into dev-dataflow
alexec Jun 25, 2021
3bc3ba9
ok
alexec Jun 25, 2021
deabfcb
Merge branch 'master' into dev-dataflow
alexec Jun 28, 2021
b06396f
ok
alexec Jun 28, 2021
9d756f5
Merge branch 'master' into dev-dataflow
alexec Jul 12, 2021
bfa94b9
add retries to UI
alexec Jul 13, 2021
6f66637
add service name
alexec Jul 13, 2021
205707b
ok
alexec Jul 13, 2021
48e53d6
ok
alexec Jul 13, 2021
5e8bf7a
Merge branch 'master' into dev-dataflow
alexec Jul 14, 2021
50958ac
upgrade df
alexec Jul 14, 2021
375b105
Merge branch 'master' into dev-dataflow
alexec Jul 15, 2021
d0975bf
upgrade dataflow
alexec Jul 15, 2021
dd3a0f6
updated symbols
alexec Jul 16, 2021
248fb82
Merge branch 'master' into dev-dataflow
alexec Jul 16, 2021
bdd9a5d
upgrade
alexec Jul 16, 2021
5a8e0ab
Merge branch 'master' into dev-dataflow
alexec Jul 20, 2021
73405d4
add commas
alexec Jul 20, 2021
4595620
fix: ui crash due to null value
alexec Jul 21, 2021
528f59c
feat: simplified UI by removing message and time
alexec Jul 21, 2021
2a8a9b3
lint
alexec Jul 21, 2021
0333a29
Merge branch 'master' into dev-dataflow
alexec Jul 21, 2021
7a49694
upgrade version
alexec Jul 21, 2021
6e13142
lint
alexec Jul 21, 2021
d50a438
Merge branch 'master' into dev-dataflow
alexec Jul 23, 2021
83b9333
upgrade
alexec Jul 23, 2021
5dc7488
Merge branch 'master' into dev-dataflow
alexec Jul 26, 2021
475eece
upgrade
alexec Jul 26, 2021
c552b9e
update
alexec Jul 27, 2021
f366798
Merge branch 'master' into dev-dataflow
alexec Jul 27, 2021
ba1f291
upgrade
alexec Jul 27, 2021
8789c77
formatRates
alexec Jul 28, 2021
1db53e4
Merge branch 'master' into dev-dataflow
alexec Jul 28, 2021
0df6d2d
Merge branch 'master' into dev-dataflow
alexec Jul 30, 2021
597c7bf
upgrade
alexec Jul 30, 2021
a261bd6
Merge branch 'master' into dev-dataflow
alexec Aug 2, 2021
e609b51
Merge branch 'master' into dev-dataflow
alexec Aug 4, 2021
87922a8
make codegen
alexec Aug 4, 2021
9c91ade
Merge branch 'master' into dev-dataflow
alexec Aug 4, 2021
59459e2
Merge branch 'master' into dev-dataflow
alexec Aug 6, 2021
ce07290
Merge branch 'master' into dev-dataflow
alexec Aug 6, 2021
c42dfd7
ok
alexec Aug 6, 2021
11477b7
Merge branch 'master' into dev-dataflow
alexec Aug 9, 2021
2cdf561
ok
alexec Aug 9, 2021
3b1c9a4
Merge branch 'master' into dev-dataflow
alexec Aug 11, 2021
877d22d
ok
alexec Aug 11, 2021
fdbd2c8
ok
alexec Aug 11, 2021
46e1372
Merge branch 'master' into dev-dataflow
alexec Aug 11, 2021
434d264
Merge branch 'master' into dev-dataflow
alexec Aug 12, 2021
dce96e5
Merge branch 'master' into dev-dataflow
alexec Aug 13, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: add expand and flatten
Signed-off-by: Alex Collins <[email protected]>
  • Loading branch information
alexec committed May 17, 2021
commit 503c354e7a233deeefdebf60f8af8b569daae2ee
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/TwinProduction/go-color v0.0.3
github.com/aliyun/aliyun-oss-go-sdk v2.1.5+incompatible
github.com/antonmedv/expr v1.8.9
github.com/argoproj-labs/argo-dataflow v0.0.8
github.com/argoproj-labs/argo-dataflow v0.0.9
github.com/argoproj/argo-events v1.2.0
github.com/argoproj/pkg v0.8.1
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAF
github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
github.com/argoproj-labs/argo-dataflow v0.0.8 h1:11zr8P3qMTTyyys01bJbqrHiX5SnEaWIsuw5iFfKiK0=
github.com/argoproj-labs/argo-dataflow v0.0.8/go.mod h1:85K86NqyK8WH+Efa8Iinh7jU8r1daKPtuTDJsZeX1KI=
github.com/argoproj-labs/argo-dataflow v0.0.9 h1:GcfxD6uVGx2rbd/ZIcD+W6jpsANh/uKTUSfWoB1qlTA=
github.com/argoproj-labs/argo-dataflow v0.0.9/go.mod h1:1toXoRvFZm0LgQfupTo5aT6MgOx8FE3h2XIBCrEu+Ls=
github.com/argoproj/argo-events v1.2.0 h1:CjF8hVUkeflhaOt9uWjJK6ai6b4pw0CCUUmOnmhWnNY=
github.com/argoproj/argo-events v1.2.0/go.mod h1:eY+egQNBLXAz/AF4mqgHsMMa4Aur7frHjUfBg+RpX04=
github.com/argoproj/pkg v0.8.1 h1:9h/sqAjUNyk0LaHkXR+2h94KNcSchvFX5aELNjXSOoc=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ export const PipelineDetails = ({history, match, location}: RouteComponentProps<
cat: true,
container: true,
cron: true,
expand: true,
filter: true,
flatten: true,
git: true,
group: true,
handler: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ import {Step} from '../../../../models/step';
import {Graph} from '../../../shared/components/graph/types';
import {Icon} from '../../../shared/components/icon';

type Type = '' | 'cat' | 'container' | 'filter' | 'git' | 'group' | 'handler' | 'map';
type Type = '' | 'cat' | 'container' | 'expand' | 'filter' | 'flatten' | 'git' | 'group' | 'handler' | 'map';

const stepIcon = (type: Type): Icon => {
switch (type) {
case 'cat':
return 'arrows-alt-h';
case 'container':
return 'cube';
case 'expand':
return 'expand';
case 'filter':
return 'filter';
case 'flatten':
return 'compress';
case 'git':
return 'code-branch';
case 'group':
Expand Down Expand Up @@ -44,10 +48,14 @@ export const graph = (pipeline: Pipeline, steps: Step[]) => {
? 'cat'
: spec.container
? 'container'
: spec.expand
? 'expand'
: spec.filter
? 'filter'
: spec.git
? 'git'
: spec.flatten
? 'flatten'
: spec.group
? 'group'
: spec.handler
Expand Down
2 changes: 2 additions & 0 deletions ui/src/app/shared/components/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export type Icon =
| 'box'
| 'calendar'
| 'cloud'
| 'compress'
| 'cube'
| 'chevron-circle-right'
| 'chevron-right'
Expand All @@ -24,6 +25,7 @@ export type Icon =
| 'check'
| 'database'
| 'envelope'
| 'expand'
| 'edit'
| 'ellipsis-h'
| 'exchange-alt'
Expand Down
2 changes: 2 additions & 0 deletions ui/src/app/shared/components/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const icons: {[key: string]: string} = {
'circle-notch': '\uf1ce',
'clock': '\uf017',
'code': '\uf121',
'compress': '\uf066',
'cube': '\uf1b2',
'cog': '\uf013',
'comment': '\uf075',
Expand All @@ -22,6 +23,7 @@ export const icons: {[key: string]: string} = {
'envelope': '\uf0e0',
'ellipsis-h': '\uf141',
'exchange-alt': '\uf362',
'expand': '\uf065',
'file': '\uf15b',
'file-alt': '\uf15c',
'file-code': '\uf1c9',
Expand Down
2 changes: 2 additions & 0 deletions ui/src/models/step.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export interface Step {
name: string;
cat?: {};
container?: {};
expand?: {};
filter?: string;
flatten?: {};
git?: {};
group?: {};
handler?: {};
Expand Down