kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'adriel-expand-collapse-operation-settings' into 'master'

Browse source 
Add expand/collapse button to operation settings

Closes #61511

See merge request gitlab-org/gitlab-ce!28840
This commit is contained in:
Kushal Pandya 2019-06-04 06:09:06 +00:00
commit 746531373d
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/error_tracking_settings/index.js
View file

@ -1,10 +1,8 @@
import Vue from 'vue';
import ErrorTrackingSettings from './components/app.vue';
import createStore from './store';
import initSettingsPanels from '~/settings_panels';
export default () => {
initSettingsPanels();
const formContainerEl = document.querySelector('.js-error-tracking-form');
const {
dataset: { apiHost, enabled, project, token, listProjectsEndpoint, operationsSettingsEndpoint },

3
app/assets/javascripts/operation_settings/components/external_dashboard.vue
View file

@ -23,11 +23,12 @@ export default {
</script>
<template>
<section class="settings expanded">
<section class="settings no-animate">
<div class="settings-header">
<h4 class="js-section-header">
{{ s__('ExternalMetrics|External Dashboard') }}
</h4>
<gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
<p class="js-section-sub-header">
{{
s__(

2
app/assets/javascripts/pages/projects/settings/operations/show/index.js
View file

@ -1,7 +1,9 @@
import mountErrorTrackingForm from '~/error_tracking_settings';
import mountOperationSettings from '~/operation_settings';
import initSettingsPanels from '~/settings_panels';
document.addEventListener('DOMContentLoaded', () => {
mountErrorTrackingForm();
mountOperationSettings();
initSettingsPanels();
});

8
spec/frontend/operation_settings/components/external_dashboard_spec.js
View file

@ -21,6 +21,14 @@ describe('operation settings external dashboard component', () => {
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', () => {
let subHeader;