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
2b402631
Commit
2b402631
authored
Mar 23, 2021
by
Sarah Groff Hennigh-Palermo
Committed by
Andrew Fontaine
Mar 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt fix for undefined job bug [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
33702b3f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
2 deletions
+32
-2
app/assets/javascripts/pipelines/components/dag/dag.vue
app/assets/javascripts/pipelines/components/dag/dag.vue
+4
-0
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
...pts/pipelines/components/graph/stage_column_component.vue
+18
-1
app/assets/javascripts/pipelines/components/unwrapping_utils.js
...sets/javascripts/pipelines/components/unwrapping_utils.js
+1
-1
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+1
-0
config/feature_flags/development/pipeline_filter_jobs.yml
config/feature_flags/development/pipeline_filter_jobs.yml
+8
-0
No files found.
app/assets/javascripts/pipelines/components/dag/dag.vue
View file @
2b402631
...
@@ -50,6 +50,10 @@ export default {
...
@@ -50,6 +50,10 @@ export default {
};
};
},
},
update
(
data
)
{
update
(
data
)
{
if
(
!
data
?.
project
?.
pipeline
)
{
return
this
.
graphData
;
}
const
{
const
{
stages
:
{
nodes
:
stages
},
stages
:
{
nodes
:
stages
},
}
=
data
.
project
.
pipeline
;
}
=
data
.
project
.
pipeline
;
...
...
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @
2b402631
<
script
>
<
script
>
import
{
capitalize
,
escape
,
isEmpty
}
from
'
lodash
'
;
import
{
capitalize
,
escape
,
isEmpty
}
from
'
lodash
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
MainGraphWrapper
from
'
../graph_shared/main_graph_wrapper.vue
'
;
import
MainGraphWrapper
from
'
../graph_shared/main_graph_wrapper.vue
'
;
import
{
accessValue
}
from
'
./accessors
'
;
import
{
accessValue
}
from
'
./accessors
'
;
import
ActionComponent
from
'
./action_component.vue
'
;
import
ActionComponent
from
'
./action_component.vue
'
;
...
@@ -15,6 +16,7 @@ export default {
...
@@ -15,6 +16,7 @@ export default {
JobItem
,
JobItem
,
MainGraphWrapper
,
MainGraphWrapper
,
},
},
mixins
:
[
glFeatureFlagMixin
()],
props
:
{
props
:
{
groups
:
{
groups
:
{
type
:
Array
,
type
:
Array
,
...
@@ -57,6 +59,21 @@ export default {
...
@@ -57,6 +59,21 @@ export default {
'
gl-pl-3
'
,
'
gl-pl-3
'
,
],
],
computed
:
{
computed
:
{
/*
currentGroups and filteredGroups are part of
a test to hunt down a bug
(see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57142).
They should be removed when the bug is rectified.
*/
currentGroups
()
{
return
this
.
glFeatures
.
pipelineFilterJobs
?
this
.
filteredGroups
:
this
.
groups
;
},
filteredGroups
()
{
return
this
.
groups
.
map
((
group
)
=>
{
return
{
...
group
,
jobs
:
group
.
jobs
.
filter
(
Boolean
)
};
});
},
formattedTitle
()
{
formattedTitle
()
{
return
capitalize
(
escape
(
this
.
title
));
return
capitalize
(
escape
(
this
.
title
));
},
},
...
@@ -104,7 +121,7 @@ export default {
...
@@ -104,7 +121,7 @@ export default {
</
template
>
</
template
>
<
template
#jobs
>
<
template
#jobs
>
<div
<div
v-for=
"group in
g
roups"
v-for=
"group in
currentG
roups"
:id=
"groupId(group)"
:id=
"groupId(group)"
:key=
"getGroupId(group)"
:key=
"getGroupId(group)"
data-testid=
"stage-column-group"
data-testid=
"stage-column-group"
...
...
app/assets/javascripts/pipelines/components/unwrapping_utils.js
View file @
2b402631
...
@@ -9,7 +9,7 @@ const unwrapGroups = (stages) => {
...
@@ -9,7 +9,7 @@ const unwrapGroups = (stages) => {
const
unwrapNodesWithName
=
(
jobArray
,
prop
,
field
=
'
name
'
)
=>
{
const
unwrapNodesWithName
=
(
jobArray
,
prop
,
field
=
'
name
'
)
=>
{
return
jobArray
.
map
((
job
)
=>
{
return
jobArray
.
map
((
job
)
=>
{
return
{
...
job
,
[
prop
]:
job
[
prop
].
nodes
.
map
((
item
)
=>
item
[
field
])
};
return
{
...
job
,
[
prop
]:
job
[
prop
].
nodes
.
map
((
item
)
=>
item
[
field
]
||
''
)
};
});
});
};
};
...
...
app/controllers/projects/pipelines_controller.rb
View file @
2b402631
...
@@ -15,6 +15,7 @@ class Projects::PipelinesController < Projects::ApplicationController
...
@@ -15,6 +15,7 @@ class Projects::PipelinesController < Projects::ApplicationController
before_action
do
before_action
do
push_frontend_feature_flag
(
:new_pipeline_form
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:new_pipeline_form
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:pipeline_graph_layers_view
,
project
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:pipeline_graph_layers_view
,
project
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:pipeline_filter_jobs
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:graphql_pipeline_details
,
project
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:graphql_pipeline_details
,
project
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:graphql_pipeline_details_users
,
current_user
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:graphql_pipeline_details_users
,
current_user
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:jira_for_vulnerabilities
,
project
,
type: :development
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:jira_for_vulnerabilities
,
project
,
type: :development
,
default_enabled: :yaml
)
...
...
config/feature_flags/development/pipeline_filter_jobs.yml
0 → 100644
View file @
2b402631
---
name
:
pipeline_filter_jobs
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57142
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/325693
milestone
:
'
13.11'
type
:
development
group
:
group::pipeline authoring
default_enabled
:
false
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