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
f5bb85b9
Commit
f5bb85b9
authored
Mar 12, 2021
by
Sarah GP
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine Sentry reporting
parent
e03ab73f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
13 deletions
+19
-13
app/assets/javascripts/pipelines/components/graph/graph_component.vue
...avascripts/pipelines/components/graph/graph_component.vue
+2
-2
app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
...ts/pipelines/components/graph/graph_component_wrapper.vue
+11
-3
app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue
...ts/pipelines/components/graph/linked_pipelines_column.vue
+3
-5
app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
...scripts/pipelines/components/graph_shared/links_inner.vue
+1
-1
spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
.../frontend/pipelines/graph/linked_pipelines_column_spec.js
+2
-2
No files found.
app/assets/javascripts/pipelines/components/graph/graph_component.vue
View file @
f5bb85b9
...
...
@@ -106,8 +106,8 @@ export default {
height
:
this
.
$refs
[
this
.
containerId
].
scrollHeight
,
};
},
onError
(
errorType
)
{
this
.
$emit
(
'
error
'
,
errorType
);
onError
(
payload
)
{
this
.
$emit
(
'
error
'
,
payload
);
},
setJob
(
jobName
)
{
this
.
hoveredJobName
=
jobName
;
...
...
app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
View file @
f5bb85b9
...
...
@@ -73,7 +73,11 @@ export default {
return
unwrapPipelineData
(
this
.
pipelineProjectPath
,
data
);
},
error
(
err
)
{
this
.
reportFailure
(
LOAD_FAILURE
,
serializeLoadErrors
(
err
));
this
.
reportFailure
({
type
:
LOAD_FAILURE
,
skipSentry
:
true
});
reportToSentry
(
this
.
$options
.
name
,
`type:
${
LOAD_FAILURE
}
, info:
${
serializeLoadErrors
(
err
)}
`
,
);
},
result
({
error
})
{
/*
...
...
@@ -134,11 +138,15 @@ export default {
refreshPipelineGraph
()
{
this
.
$apollo
.
queries
.
pipeline
.
refetch
();
},
reportFailure
(
type
,
err
=
''
)
{
/* eslint-disable @gitlab/require-i18n-strings */
reportFailure
({
type
,
err
=
'
No error string passed.
'
,
skipSentry
=
false
})
{
this
.
showAlert
=
true
;
this
.
alertType
=
type
;
reportToSentry
(
this
.
$options
.
name
,
`type:
${
this
.
alertType
}
, info:
${
err
}
`
);
if
(
!
skipSentry
)
{
reportToSentry
(
this
.
$options
.
name
,
`type:
${
type
}
, info:
${
err
}
`
);
}
},
/* eslint-enable @gitlab/require-i18n-strings */
},
};
</
script
>
...
...
app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue
View file @
f5bb85b9
...
...
@@ -111,14 +111,12 @@ export default {
this
.
loadingPipelineId
=
null
;
this
.
$emit
(
'
scrollContainer
'
);
},
error
(
err
,
_vm
,
_key
,
type
)
{
this
.
$emit
(
'
error
'
,
LOAD_FAILURE
);
error
(
err
)
{
this
.
$emit
(
'
error
'
,
{
type
:
LOAD_FAILURE
,
skipSentry
:
true
}
);
reportToSentry
(
'
linked_pipelines_column
'
,
`error type:
${
LOAD_FAILURE
}
, error:
${
serializeLoadErrors
(
err
,
)}
, apollo error type:
${
type
}
`
,
`error type:
${
LOAD_FAILURE
}
, error:
${
serializeLoadErrors
(
err
)}
`
,
);
},
});
...
...
app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
View file @
f5bb85b9
...
...
@@ -170,7 +170,7 @@ export default {
const
parsedData
=
parseData
(
arrayOfJobs
);
this
.
links
=
generateLinksData
(
parsedData
,
this
.
containerId
,
`-
${
this
.
pipelineId
}
`
);
}
catch
(
err
)
{
this
.
$emit
(
'
error
'
,
DRAW_FAILURE
);
this
.
$emit
(
'
error
'
,
{
type
:
DRAW_FAILURE
,
reportToSentry
:
false
}
);
reportToSentry
(
this
.
$options
.
name
,
err
);
}
this
.
finishPerfMeasureAndSend
();
...
...
spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
View file @
f5bb85b9
...
...
@@ -116,7 +116,7 @@ describe('Linked Pipelines Column', () => {
it
(
'
emits the error
'
,
async
()
=>
{
await
clickExpandButton
();
expect
(
wrapper
.
emitted
().
error
).
toEqual
([[
LOAD_FAILURE
]]);
expect
(
wrapper
.
emitted
().
error
).
toEqual
([[
{
type
:
LOAD_FAILURE
,
skipSentry
:
true
}
]]);
});
it
(
'
does not show the pipeline
'
,
async
()
=>
{
...
...
@@ -167,7 +167,7 @@ describe('Linked Pipelines Column', () => {
it
(
'
emits the error
'
,
async
()
=>
{
await
clickExpandButton
();
expect
(
wrapper
.
emitted
().
error
).
toEqual
([[
LOAD_FAILURE
]]);
expect
(
wrapper
.
emitted
().
error
).
toEqual
([[
{
type
:
LOAD_FAILURE
,
skipSentry
:
true
}
]]);
});
it
(
'
does not show the pipeline
'
,
async
()
=>
{
...
...
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