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
ae7f1cef
Commit
ae7f1cef
authored
Sep 25, 2019
by
Mark Fletcher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable tab navigation whilst current page loads
parent
65acf407
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
1 deletion
+28
-1
ee/app/assets/javascripts/insights/components/insights.vue
ee/app/assets/javascripts/insights/components/insights.vue
+8
-1
ee/changelogs/unreleased/32664-disallow-changing-of-insights-tab-whilst-page-is-loading.yml
...allow-changing-of-insights-tab-whilst-page-is-loading.yml
+5
-0
ee/spec/javascripts/insights/components/insights_spec.js
ee/spec/javascripts/insights/components/insights_spec.js
+15
-0
No files found.
ee/app/assets/javascripts/insights/components/insights.vue
View file @
ae7f1cef
...
...
@@ -23,7 +23,13 @@ export default {
},
},
computed
:
{
...
mapState
(
'
insights
'
,
[
'
configData
'
,
'
configLoading
'
,
'
activeTab
'
,
'
activePage
'
]),
...
mapState
(
'
insights
'
,
[
'
configData
'
,
'
configLoading
'
,
'
activeTab
'
,
'
activePage
'
,
'
pageLoading
'
,
]),
pages
()
{
const
{
configData
,
activeTab
}
=
this
;
...
...
@@ -68,6 +74,7 @@ export default {
menu-class=
"w-100 mw-100"
toggle-class=
"dropdown-menu-toggle w-100 gl-field-error-outline"
:text=
"__('Select Page')"
:disabled=
"pageLoading"
>
<gl-dropdown-item
v-for=
"page in pages"
...
...
ee/changelogs/unreleased/32664-disallow-changing-of-insights-tab-whilst-page-is-loading.yml
0 → 100644
View file @
ae7f1cef
---
title
:
Disable insights tab navigation whilst current page loads
merge_request
:
17678
author
:
type
:
added
ee/spec/javascripts/insights/components/insights_spec.js
View file @
ae7f1cef
...
...
@@ -68,6 +68,21 @@ describe('Insights component', () => {
done
();
});
});
describe
(
'
when loading page
'
,
()
=>
{
beforeEach
(()
=>
{
vm
.
$store
.
state
.
insights
.
pageLoading
=
true
;
});
it
(
'
disables the tab selector
'
,
done
=>
{
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-insights-dropdown > button
'
).
getAttribute
(
'
disabled
'
),
).
toBe
(
'
disabled
'
);
done
();
});
});
});
});
describe
(
'
empty config
'
,
()
=>
{
...
...
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