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
e0725fa4
Commit
e0725fa4
authored
Apr 05, 2019
by
Fernando Arias
Committed by
Mike Greiling
Apr 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dynamic vuln graph dimensions
* Fix up graph resize logic if navbar is collapsed Add snapshot
parent
b54d466c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
128 additions
and
0 deletions
+128
-0
app/assets/javascripts/contextual_sidebar.js
app/assets/javascripts/contextual_sidebar.js
+3
-0
app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue
.../components/resizable_chart/resizable_chart_container.vue
+40
-0
spec/frontend/vue_shared/components/__snapshots__/resizable_chart_container_spec.js.snap
...ents/__snapshots__/resizable_chart_container_spec.js.snap
+21
-0
spec/frontend/vue_shared/components/resizable_chart_container_spec.js
...d/vue_shared/components/resizable_chart_container_spec.js
+64
-0
No files found.
app/assets/javascripts/contextual_sidebar.js
View file @
e0725fa4
...
...
@@ -41,6 +41,9 @@ export default class ContextualSidebar {
this
.
toggleCollapsedSidebar
(
value
,
true
);
}
});
this
.
$page
.
on
(
'
transitionstart transitionend
'
,
()
=>
{
$
(
document
).
trigger
(
'
content.resize
'
);
});
$
(
window
).
on
(
'
resize
'
,
()
=>
_
.
debounce
(
this
.
render
(),
100
));
}
...
...
app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue
0 → 100644
View file @
e0725fa4
<
script
>
import
{
debounceByAnimationFrame
}
from
'
~/lib/utils/common_utils
'
;
import
$
from
'
jquery
'
;
export
default
{
data
()
{
return
{
width
:
0
,
height
:
0
,
};
},
beforeDestroy
()
{
this
.
contentResizeHandler
.
off
(
'
content.resize
'
,
this
.
debouncedResize
);
window
.
removeEventListener
(
'
resize
'
,
this
.
debouncedResize
);
},
created
()
{
this
.
debouncedResize
=
debounceByAnimationFrame
(
this
.
onResize
);
// Handle when we explicictly trigger a custom resize event
this
.
contentResizeHandler
=
$
(
document
).
on
(
'
content.resize
'
,
this
.
debouncedResize
);
// Handle window resize
window
.
addEventListener
(
'
resize
'
,
this
.
debouncedResize
);
},
methods
:
{
onResize
()
{
// Slot dimensions
const
{
clientWidth
,
clientHeight
}
=
this
.
$refs
.
chartWrapper
;
this
.
width
=
clientWidth
;
this
.
height
=
clientHeight
;
},
},
};
</
script
>
<
template
>
<div
ref=
"chartWrapper"
>
<slot
:width=
"width"
:height=
"height"
>
</slot>
</div>
</
template
>
spec/frontend/vue_shared/components/__snapshots__/resizable_chart_container_spec.js.snap
0 → 100644
View file @
e0725fa4
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Resizable Chart Container renders the component 1`] = `
<div>
<div
class="slot"
>
<span
class="width"
>
0
</span>
<span
class="height"
>
0
</span>
</div>
</div>
`;
spec/frontend/vue_shared/components/resizable_chart_container_spec.js
0 → 100644
View file @
e0725fa4
import
Vue
from
'
vue
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
ResizableChartContainer
from
'
~/vue_shared/components/resizable_chart/resizable_chart_container.vue
'
;
import
$
from
'
jquery
'
;
jest
.
mock
(
'
~/lib/utils/common_utils
'
,
()
=>
({
debounceByAnimationFrame
(
callback
)
{
return
jest
.
spyOn
({
callback
},
'
callback
'
);
},
}));
describe
(
'
Resizable Chart Container
'
,
()
=>
{
let
wrapper
;
beforeEach
(()
=>
{
wrapper
=
mount
(
ResizableChartContainer
,
{
attachToDocument
:
true
,
scopedSlots
:
{
default
:
`
<div class="slot" slot-scope="{ width, height }">
<span class="width">{{width}}</span>
<span class="height">{{height}}</span>
</div>
`
,
},
});
});
afterEach
(()
=>
{
wrapper
.
destroy
();
});
it
(
'
renders the component
'
,
()
=>
{
expect
(
wrapper
.
element
).
toMatchSnapshot
();
});
it
(
'
updates the slot width and height props
'
,
()
=>
{
const
width
=
1920
;
const
height
=
1080
;
// JSDOM mocks and sets clientWidth/clientHeight to 0 so we set manually
wrapper
.
vm
.
$refs
.
chartWrapper
=
{
clientWidth
:
width
,
clientHeight
:
height
};
$
(
document
).
trigger
(
'
content.resize
'
);
return
Vue
.
nextTick
().
then
(()
=>
{
const
widthNode
=
wrapper
.
find
(
'
.slot > .width
'
);
const
heightNode
=
wrapper
.
find
(
'
.slot > .height
'
);
expect
(
parseInt
(
widthNode
.
text
(),
10
)).
toEqual
(
width
);
expect
(
parseInt
(
heightNode
.
text
(),
10
)).
toEqual
(
height
);
});
});
it
(
'
calls onResize on manual resize
'
,
()
=>
{
$
(
document
).
trigger
(
'
content.resize
'
);
expect
(
wrapper
.
vm
.
debouncedResize
).
toHaveBeenCalled
();
});
it
(
'
calls onResize on page resize
'
,
()
=>
{
window
.
dispatchEvent
(
new
Event
(
'
resize
'
));
expect
(
wrapper
.
vm
.
debouncedResize
).
toHaveBeenCalled
();
});
});
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