Commit 340ea9aa authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '61511-add-expand-collapse-to-project-operation-settings' into 'master'

Add expand/collapse button to error tracking settings

See merge request gitlab-org/gitlab-ce!28619
parents b6c12f80 a9ddd949
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 },
......
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
- setting = error_tracking_setting - setting = error_tracking_setting
%section.settings.expanded.no-animate %section.settings.no-animate.js-error-tracking-settings
.settings-header .settings-header
%h4 %h4
= _('Error Tracking') = _('Error Tracking')
%button.btn.js-settings-toggle{ type: 'button' }
= _('Expand')
%p %p
= _('To link Sentry to GitLab, enter your Sentry URL and Auth Token.') = _('To link Sentry to GitLab, enter your Sentry URL and Auth Token.')
= link_to _('More information'), help_page_path('user/project/operations/error_tracking'), target: '_blank', rel: 'noopener noreferrer' = link_to _('More information'), help_page_path('user/project/operations/error_tracking'), target: '_blank', rel: 'noopener noreferrer'
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
- breadcrumb_title _('Operations Settings') - breadcrumb_title _('Operations Settings')
= render_if_exists 'projects/settings/operations/incidents' = render_if_exists 'projects/settings/operations/incidents'
= render 'projects/settings/operations/error_tracking', expanded: true = render 'projects/settings/operations/error_tracking'
= render 'projects/settings/operations/external_dashboard' = render 'projects/settings/operations/external_dashboard'
= render_if_exists 'projects/settings/operations/tracing' = render_if_exists 'projects/settings/operations/tracing'
---
title: Add expand/collapse to error tracking settings
merge_request: 28619
author:
type: added
...@@ -46,6 +46,9 @@ describe 'Projects > Settings > For a forked project', :js do ...@@ -46,6 +46,9 @@ describe 'Projects > Settings > For a forked project', :js do
wait_for_requests wait_for_requests
within '.js-error-tracking-settings' do
click_button('Expand')
end
expect(page).to have_content('Sentry API URL') expect(page).to have_content('Sentry API URL')
expect(page.body).to include('Error Tracking') expect(page.body).to include('Error Tracking')
expect(page).to have_button('Connect') expect(page).to have_button('Connect')
...@@ -86,6 +89,9 @@ describe 'Projects > Settings > For a forked project', :js do ...@@ -86,6 +89,9 @@ describe 'Projects > Settings > For a forked project', :js do
wait_for_requests wait_for_requests
within '.js-error-tracking-settings' do
click_button('Expand')
end
check('Active') check('Active')
fill_in('error-tracking-api-host', with: 'http://sentry.example.com') fill_in('error-tracking-api-host', with: 'http://sentry.example.com')
fill_in('error-tracking-token', with: 'token') fill_in('error-tracking-token', with: 'token')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment