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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a23ea78e
Commit
a23ea78e
authored
Jun 04, 2019
by
Adriel Santiago
Committed by
Kushal Pandya
Jun 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add expand/collapse button
Add ability to expand/collapse operation settings
parent
09234566
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/error_tracking_settings/index.js
app/assets/javascripts/error_tracking_settings/index.js
+0
-2
app/assets/javascripts/operation_settings/components/external_dashboard.vue
...ipts/operation_settings/components/external_dashboard.vue
+2
-1
app/assets/javascripts/pages/projects/settings/operations/show/index.js
...ascripts/pages/projects/settings/operations/show/index.js
+2
-0
spec/frontend/operation_settings/components/external_dashboard_spec.js
.../operation_settings/components/external_dashboard_spec.js
+8
-0
No files found.
app/assets/javascripts/error_tracking_settings/index.js
View file @
a23ea78e
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
ErrorTrackingSettings
from
'
./components/app.vue
'
;
import
ErrorTrackingSettings
from
'
./components/app.vue
'
;
import
createStore
from
'
./store
'
;
import
createStore
from
'
./store
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
export
default
()
=>
{
export
default
()
=>
{
initSettingsPanels
();
const
formContainerEl
=
document
.
querySelector
(
'
.js-error-tracking-form
'
);
const
formContainerEl
=
document
.
querySelector
(
'
.js-error-tracking-form
'
);
const
{
const
{
dataset
:
{
apiHost
,
enabled
,
project
,
token
,
listProjectsEndpoint
,
operationsSettingsEndpoint
},
dataset
:
{
apiHost
,
enabled
,
project
,
token
,
listProjectsEndpoint
,
operationsSettingsEndpoint
},
...
...
app/assets/javascripts/operation_settings/components/external_dashboard.vue
View file @
a23ea78e
...
@@ -23,11 +23,12 @@ export default {
...
@@ -23,11 +23,12 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<section
class=
"settings
expanded
"
>
<section
class=
"settings
no-animate
"
>
<div
class=
"settings-header"
>
<div
class=
"settings-header"
>
<h4
class=
"js-section-header"
>
<h4
class=
"js-section-header"
>
{{
s__
(
'
ExternalMetrics|External Dashboard
'
)
}}
{{
s__
(
'
ExternalMetrics|External Dashboard
'
)
}}
</h4>
</h4>
<gl-button
class=
"js-settings-toggle"
>
{{
__
(
'
Expand
'
)
}}
</gl-button>
<p
class=
"js-section-sub-header"
>
<p
class=
"js-section-sub-header"
>
{{
{{
s__
(
s__
(
...
...
app/assets/javascripts/pages/projects/settings/operations/show/index.js
View file @
a23ea78e
import
mountErrorTrackingForm
from
'
~/error_tracking_settings
'
;
import
mountErrorTrackingForm
from
'
~/error_tracking_settings
'
;
import
mountOperationSettings
from
'
~/operation_settings
'
;
import
mountOperationSettings
from
'
~/operation_settings
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
mountErrorTrackingForm
();
mountErrorTrackingForm
();
mountOperationSettings
();
mountOperationSettings
();
initSettingsPanels
();
});
});
spec/frontend/operation_settings/components/external_dashboard_spec.js
View file @
a23ea78e
...
@@ -21,6 +21,14 @@ describe('operation settings external dashboard component', () => {
...
@@ -21,6 +21,14 @@ describe('operation settings external dashboard component', () => {
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
External Dashboard
'
);
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
External Dashboard
'
);
});
});
describe
(
'
expand/collapse button
'
,
()
=>
{
it
(
'
renders as an expand button by default
'
,
()
=>
{
const
button
=
wrapper
.
find
(
GlButton
);
expect
(
button
.
text
()).
toBe
(
'
Expand
'
);
});
});
describe
(
'
sub-header
'
,
()
=>
{
describe
(
'
sub-header
'
,
()
=>
{
let
subHeader
;
let
subHeader
;
...
...
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