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
fb61c6a2
Commit
fb61c6a2
authored
Mar 24, 2021
by
Sarah Groff Hennigh-Palermo
Committed by
Jose Ivan Vargas
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add error for old pipelines
Includes changes and specs
parent
a9f4517a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
2 deletions
+51
-2
app/assets/javascripts/pipelines/components/graph/constants.js
...ssets/javascripts/pipelines/components/graph/constants.js
+2
-0
app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
...ts/pipelines/components/graph/graph_component_wrapper.vue
+20
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
.../frontend/pipelines/graph/graph_component_wrapper_spec.js
+26
-0
No files found.
app/assets/javascripts/pipelines/components/graph/constants.js
View file @
fb61c6a2
...
@@ -13,3 +13,5 @@ export const GRAPHQL = 'graphql';
...
@@ -13,3 +13,5 @@ export const GRAPHQL = 'graphql';
export
const
STAGE_VIEW
=
'
stage
'
;
export
const
STAGE_VIEW
=
'
stage
'
;
export
const
LAYER_VIEW
=
'
layer
'
;
export
const
LAYER_VIEW
=
'
layer
'
;
export
const
IID_FAILURE
=
'
missing_iid
'
;
app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
View file @
fb61c6a2
...
@@ -4,7 +4,7 @@ import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.qu
...
@@ -4,7 +4,7 @@ import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.qu
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
DEFAULT
,
DRAW_FAILURE
,
LOAD_FAILURE
}
from
'
../../constants
'
;
import
{
DEFAULT
,
DRAW_FAILURE
,
LOAD_FAILURE
}
from
'
../../constants
'
;
import
{
STAGE_VIEW
}
from
'
./constants
'
;
import
{
IID_FAILURE
,
STAGE_VIEW
}
from
'
./constants
'
;
import
PipelineGraph
from
'
./graph_component.vue
'
;
import
PipelineGraph
from
'
./graph_component.vue
'
;
import
GraphViewSelector
from
'
./graph_view_selector.vue
'
;
import
GraphViewSelector
from
'
./graph_view_selector.vue
'
;
import
{
import
{
...
@@ -48,6 +48,9 @@ export default {
...
@@ -48,6 +48,9 @@ export default {
},
},
errorTexts
:
{
errorTexts
:
{
[
DRAW_FAILURE
]:
__
(
'
An error occurred while drawing job relationship links.
'
),
[
DRAW_FAILURE
]:
__
(
'
An error occurred while drawing job relationship links.
'
),
[
IID_FAILURE
]:
__
(
'
The data in this pipeline is too old to be rendered as a graph. Please check the Jobs tab to access historical data.
'
,
),
[
LOAD_FAILURE
]:
__
(
'
We are currently unable to fetch data for this pipeline.
'
),
[
LOAD_FAILURE
]:
__
(
'
We are currently unable to fetch data for this pipeline.
'
),
[
DEFAULT
]:
__
(
'
An unknown error occurred while loading this graph.
'
),
[
DEFAULT
]:
__
(
'
An unknown error occurred while loading this graph.
'
),
},
},
...
@@ -64,6 +67,9 @@ export default {
...
@@ -64,6 +67,9 @@ export default {
iid
:
this
.
pipelineIid
,
iid
:
this
.
pipelineIid
,
};
};
},
},
skip
()
{
return
!
(
this
.
pipelineProjectPath
&&
this
.
pipelineIid
);
},
update
(
data
)
{
update
(
data
)
{
/*
/*
This check prevents the pipeline from being overwritten
This check prevents the pipeline from being overwritten
...
@@ -104,6 +110,11 @@ export default {
...
@@ -104,6 +110,11 @@ export default {
text
:
this
.
$options
.
errorTexts
[
DRAW_FAILURE
],
text
:
this
.
$options
.
errorTexts
[
DRAW_FAILURE
],
variant
:
'
danger
'
,
variant
:
'
danger
'
,
};
};
case
IID_FAILURE
:
return
{
text
:
this
.
$options
.
errorTexts
[
IID_FAILURE
],
variant
:
'
info
'
,
};
case
LOAD_FAILURE
:
case
LOAD_FAILURE
:
return
{
return
{
text
:
this
.
$options
.
errorTexts
[
LOAD_FAILURE
],
text
:
this
.
$options
.
errorTexts
[
LOAD_FAILURE
],
...
@@ -129,8 +140,15 @@ export default {
...
@@ -129,8 +140,15 @@ export default {
*/
*/
return
this
.
$apollo
.
queries
.
pipeline
.
loading
&&
!
this
.
pipeline
;
return
this
.
$apollo
.
queries
.
pipeline
.
loading
&&
!
this
.
pipeline
;
},
},
showGraphViewSelector
()
{
return
Boolean
(
this
.
glFeatures
.
pipelineGraphLayersView
&&
this
.
pipeline
);
},
},
},
mounted
()
{
mounted
()
{
if
(
!
this
.
pipelineIid
)
{
this
.
reportFailure
({
type
:
IID_FAILURE
,
skipSentry
:
true
});
}
toggleQueryPollingByVisibility
(
this
.
$apollo
.
queries
.
pipeline
);
toggleQueryPollingByVisibility
(
this
.
$apollo
.
queries
.
pipeline
);
},
},
errorCaptured
(
err
,
_vm
,
info
)
{
errorCaptured
(
err
,
_vm
,
info
)
{
...
@@ -165,7 +183,7 @@ export default {
...
@@ -165,7 +183,7 @@ export default {
{{
alert
.
text
}}
{{
alert
.
text
}}
</gl-alert>
</gl-alert>
<graph-view-selector
<graph-view-selector
v-if=
"
glFeatures.pipelineGraphLayersView
"
v-if=
"
showGraphViewSelector
"
:type=
"currentViewType"
:type=
"currentViewType"
@
updateViewType=
"updateViewType"
@
updateViewType=
"updateViewType"
/>
/>
...
...
locale/gitlab.pot
View file @
fb61c6a2
...
@@ -30066,6 +30066,9 @@ msgstr ""
...
@@ -30066,6 +30066,9 @@ msgstr ""
msgid "The current user is not authorized to access the job log."
msgid "The current user is not authorized to access the job log."
msgstr ""
msgstr ""
msgid "The data in this pipeline is too old to be rendered as a graph. Please check the Jobs tab to access historical data."
msgstr ""
msgid "The data source is connected, but there is no data to display. %{documentationLink}"
msgid "The data source is connected, but there is no data to display. %{documentationLink}"
msgstr ""
msgstr ""
...
...
spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
View file @
fb61c6a2
...
@@ -4,6 +4,7 @@ import Vue from 'vue';
...
@@ -4,6 +4,7 @@ import Vue from 'vue';
import
VueApollo
from
'
vue-apollo
'
;
import
VueApollo
from
'
vue-apollo
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
getPipelineDetails
from
'
shared_queries/pipelines/get_pipeline_details.query.graphql
'
;
import
getPipelineDetails
from
'
shared_queries/pipelines/get_pipeline_details.query.graphql
'
;
import
{
IID_FAILURE
}
from
'
~/pipelines/components/graph/constants
'
;
import
PipelineGraph
from
'
~/pipelines/components/graph/graph_component.vue
'
;
import
PipelineGraph
from
'
~/pipelines/components/graph/graph_component.vue
'
;
import
PipelineGraphWrapper
from
'
~/pipelines/components/graph/graph_component_wrapper.vue
'
;
import
PipelineGraphWrapper
from
'
~/pipelines/components/graph/graph_component_wrapper.vue
'
;
import
GraphViewSelector
from
'
~/pipelines/components/graph/graph_view_selector.vue
'
;
import
GraphViewSelector
from
'
~/pipelines/components/graph/graph_view_selector.vue
'
;
...
@@ -126,6 +127,31 @@ describe('Pipeline graph wrapper', () => {
...
@@ -126,6 +127,31 @@ describe('Pipeline graph wrapper', () => {
});
});
});
});
describe
(
'
when there is no pipeline iid available
'
,
()
=>
{
beforeEach
(
async
()
=>
{
createComponentWithApollo
({
provide
:
{
pipelineIid
:
''
,
},
});
jest
.
runOnlyPendingTimers
();
await
wrapper
.
vm
.
$nextTick
();
});
it
(
'
does not display the loading icon
'
,
()
=>
{
expect
(
getLoadingIcon
().
exists
()).
toBe
(
false
);
});
it
(
'
displays the no iid alert
'
,
()
=>
{
expect
(
getAlert
().
exists
()).
toBe
(
true
);
expect
(
getAlert
().
text
()).
toBe
(
wrapper
.
vm
.
$options
.
errorTexts
[
IID_FAILURE
]);
});
it
(
'
does not display the graph
'
,
()
=>
{
expect
(
getGraph
().
exists
()).
toBe
(
false
);
});
});
describe
(
'
when refresh action is emitted
'
,
()
=>
{
describe
(
'
when refresh action is emitted
'
,
()
=>
{
beforeEach
(
async
()
=>
{
beforeEach
(
async
()
=>
{
createComponentWithApollo
();
createComponentWithApollo
();
...
...
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