Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
gitlab-ce
Commits
8df13b48
Commit
8df13b48
authored
6 years ago
by
Simon Knox
Browse files
Options
Download
Email Patches
Plain Diff
Hide Expand button on Performance MR Widget if no changes
parent
25cac8f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
28 deletions
+31
-28
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-3
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+7
-15
ee/changelogs/unreleased/6766-performance-mr-widget-is-expandable-even-when-there-are-no-changes.yml
...r-widget-is-expandable-even-when-there-are-no-changes.yml
+5
-0
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
+18
-10
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
8df13b48
...
...
@@ -54,8 +54,7 @@ export default {
return
(
this
.
mr
.
performanceMetrics
&&
((
this
.
mr
.
performanceMetrics
.
degraded
&&
this
.
mr
.
performanceMetrics
.
degraded
.
length
>
0
)
||
(
this
.
mr
.
performanceMetrics
.
improved
&&
this
.
mr
.
performanceMetrics
.
improved
.
length
>
0
)
||
(
this
.
mr
.
performanceMetrics
.
neutral
&&
this
.
mr
.
performanceMetrics
.
neutral
.
length
>
0
))
(
this
.
mr
.
performanceMetrics
.
improved
&&
this
.
mr
.
performanceMetrics
.
improved
.
length
>
0
))
);
},
hasLicenseReportIssues
()
{
...
...
@@ -268,7 +267,6 @@ export default {
:success-text=
"performanceText"
:unresolved-issues=
"mr.performanceMetrics.degraded"
:resolved-issues=
"mr.performanceMetrics.improved"
:neutral-issues=
"mr.performanceMetrics.neutral"
:has-issues=
"hasPerformanceMetrics"
:component=
"$options.componentNames.PerformanceIssueBody"
class=
"js-performance-widget mr-widget-border-top"
...
...
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
8df13b48
...
...
@@ -66,7 +66,6 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this
.
performanceMetrics
=
{
improved
:
[],
degraded
:
[],
neutral
:
[],
};
}
...
...
@@ -97,7 +96,6 @@ export default class MergeRequestStore extends CEMergeRequestStore {
const
improved
=
[];
const
degraded
=
[];
const
neutral
=
[];
Object
.
keys
(
headMetricsIndexed
).
forEach
(
subject
=>
{
const
subjectMetrics
=
headMetricsIndexed
[
subject
];
...
...
@@ -115,24 +113,18 @@ export default class MergeRequestStore extends CEMergeRequestStore {
delta
:
headMetricData
.
value
-
baseMetricData
.
value
,
};
if
(
metricData
.
delta
=
==
0
)
{
neutral
.
push
(
metricData
);
}
else
if
(
metricData
.
delta
*
metricDirection
>
0
)
{
improved
.
push
(
metricData
);
}
else
{
degraded
.
push
(
metricData
);
if
(
metricData
.
delta
!
==
0
)
{
if
(
metricDirection
>
0
)
{
improved
.
push
(
metricData
);
}
else
{
degraded
.
push
(
metricData
);
}
}
}
else
{
neutral
.
push
({
name
:
metric
,
path
:
subject
,
score
:
headMetricData
.
value
,
});
}
});
});
this
.
performanceMetrics
=
{
improved
,
degraded
,
neutral
};
this
.
performanceMetrics
=
{
improved
,
degraded
};
}
parseLicenseReportMetrics
(
headMetrics
,
baseMetrics
)
{
...
...
This diff is collapsed.
Click to expand it.
ee/changelogs/unreleased/6766-performance-mr-widget-is-expandable-even-when-there-are-no-changes.yml
0 → 100644
View file @
8df13b48
---
title
:
Hide Expand button on empty MR widget Performance section
merge_request
:
6685
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
View file @
8df13b48
...
...
@@ -484,21 +484,29 @@ describe('ee merge request widget options', () => {
});
describe
(
'
with empty successful request
'
,
()
=>
{
beforeEach
(
()
=>
{
beforeEach
(
done
=>
{
mock
.
onGet
(
'
head.json
'
).
reply
(
200
,
[]);
mock
.
onGet
(
'
base.json
'
).
reply
(
200
,
[]);
vm
=
mountComponent
(
Component
);
// wait for network request from component created() method
setTimeout
(
done
,
0
);
});
it
(
'
should render provided data
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
removeBreakLine
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
,
),
).
toEqual
(
'
No changes to performance metrics
'
);
done
();
},
0
);
it
(
'
should render provided data
'
,
()
=>
{
expect
(
removeBreakLine
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
,
),
).
toEqual
(
'
No changes to performance metrics
'
);
});
it
(
'
does not show Expand button
'
,
()
=>
{
const
expandButton
=
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-collapse-btn
'
);
expect
(
expandButton
).
toBeNull
();
});
it
(
'
shows success icon
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-ci-status-icon-success
'
)).
not
.
toBeNull
();
});
});
...
...
This diff is collapsed.
Click to expand it.
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