Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
32b8b8df
Commit
32b8b8df
authored
Jun 06, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mock code and fix refs to triggered and triggeredBy.
parent
92198c69
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
35 deletions
+8
-35
app/assets/javascripts/pipelines/components/graph/graph_component.vue
...avascripts/pipelines/components/graph/graph_component.vue
+8
-10
app/assets/javascripts/pipelines/pipeline_details_bundle.js
app/assets/javascripts/pipelines/pipeline_details_bundle.js
+0
-2
app/assets/javascripts/pipelines/pipeline_details_mediatior.js
...ssets/javascripts/pipelines/pipeline_details_mediatior.js
+0
-1
app/assets/javascripts/pipelines/stores/pipeline_store.js
app/assets/javascripts/pipelines/stores/pipeline_store.js
+0
-22
No files found.
app/assets/javascripts/pipelines/components/graph/graph_component.vue
View file @
32b8b8df
...
...
@@ -13,14 +13,6 @@
type
:
Object
,
required
:
true
,
},
triggered
:
{
type
:
Array
,
required
:
true
,
},
triggeredBy
:
{
type
:
Array
,
required
:
true
,
},
},
components
:
{
linkedPipelinesColumn
,
...
...
@@ -31,11 +23,17 @@
graph
()
{
return
this
.
pipeline
.
details
&&
this
.
pipeline
.
details
.
stages
;
},
triggered
()
{
return
this
.
pipeline
.
triggered
||
[];
},
triggeredBy
()
{
return
this
.
pipeline
.
triggeredBy
||
[];
},
hasTriggered
()
{
return
this
.
triggered
.
length
;
return
!!
this
.
triggered
.
length
;
},
hasTriggeredBy
()
{
return
this
.
triggeredBy
.
length
;
return
!!
this
.
triggeredBy
.
length
;
},
},
methods
:
{
...
...
app/assets/javascripts/pipelines/pipeline_details_bundle.js
View file @
32b8b8df
...
...
@@ -24,8 +24,6 @@ document.addEventListener('DOMContentLoaded', () => {
props
:
{
isLoading
:
this
.
mediator
.
state
.
isLoading
,
pipeline
:
this
.
mediator
.
store
.
state
.
pipeline
,
triggeredBy
:
this
.
mediator
.
store
.
state
.
triggeredBy
,
triggered
:
this
.
mediator
.
store
.
state
.
triggered
,
},
});
},
...
...
app/assets/javascripts/pipelines/pipeline_details_mediatior.js
View file @
32b8b8df
...
...
@@ -39,7 +39,6 @@ export default class pipelinesMediator {
successCallback
(
response
)
{
const
data
=
response
.
json
();
this
.
state
.
isLoading
=
false
;
this
.
store
.
storePipeline
(
data
);
}
...
...
app/assets/javascripts/pipelines/stores/pipeline_store.js
View file @
32b8b8df
const
mockTriggerers
=
[
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab Shell
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
,
label
:
'
pending
'
}
}
},
];
const
mockTriggereds
=
[
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab EE
'
},
details
:
{
status
:
{
icon
:
'
icon_status_failed
'
,
group
:
'
failed
'
,
label
:
'
failed
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
Gitaly
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
,
label
:
'
pending
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitHub
'
},
details
:
{
status
:
{
icon
:
'
icon_status_success
'
,
group
:
'
success
'
,
label
:
'
success
'
}
}
},
];
export
default
class
PipelineStore
{
constructor
()
{
this
.
state
=
{};
this
.
state
.
pipeline
=
{};
this
.
state
.
triggered
=
[];
this
.
state
.
triggeredBy
=
[];
}
storePipeline
(
pipeline
=
{})
{
// single job in first stage
pipeline
.
details
.
stages
[
3
].
groups
=
[
pipeline
.
details
.
stages
[
0
].
groups
[
0
]];
// multiple jobs in last stage
// pipeline.details.stages[3].groups.push(pipeline.details.stages[0].groups[0]);
this
.
state
.
pipeline
=
pipeline
;
this
.
state
.
triggeredBy
=
mockTriggerers
;
// single triggered
// this.state.triggered = [mockTriggereds[0]];
this
.
state
.
triggered
=
mockTriggereds
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment