From 6688d800ca45ae9352f95972e71431de3232fa5f Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 14 Aug 2018 23:07:58 +0100 Subject: Move cohorts and conv dev index js to new pages location --- app/assets/javascripts/pages/admin/cohorts/index.js | 3 --- app/assets/javascripts/pages/admin/cohorts/usage_ping.js | 13 ------------- .../admin/conversational_development_index/show/index.js | 3 --- .../javascripts/pages/instance_statistics/cohorts/index.js | 3 +++ .../pages/instance_statistics/cohorts/usage_ping.js | 13 +++++++++++++ .../conversational_development_index/show/index.js | 3 +++ 6 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 app/assets/javascripts/pages/admin/cohorts/index.js delete mode 100644 app/assets/javascripts/pages/admin/cohorts/usage_ping.js delete mode 100644 app/assets/javascripts/pages/admin/conversational_development_index/show/index.js create mode 100644 app/assets/javascripts/pages/instance_statistics/cohorts/index.js create mode 100644 app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js create mode 100644 app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js diff --git a/app/assets/javascripts/pages/admin/cohorts/index.js b/app/assets/javascripts/pages/admin/cohorts/index.js deleted file mode 100644 index 2d5020dbef4..00000000000 --- a/app/assets/javascripts/pages/admin/cohorts/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import initUsagePing from './usage_ping'; - -document.addEventListener('DOMContentLoaded', initUsagePing); diff --git a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js b/app/assets/javascripts/pages/admin/cohorts/usage_ping.js deleted file mode 100644 index 914a9661c27..00000000000 --- a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js +++ /dev/null @@ -1,13 +0,0 @@ -import axios from '../../../lib/utils/axios_utils'; -import { __ } from '../../../locale'; -import flash from '../../../flash'; - -export default function UsagePing() { - const el = document.querySelector('.usage-data'); - - axios.get(el.dataset.endpoint, { - responseType: 'text', - }).then(({ data }) => { - el.innerHTML = data; - }).catch(() => flash(__('Error fetching usage ping data.'))); -} diff --git a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js b/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js deleted file mode 100644 index c1056537f90..00000000000 --- a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import UserCallout from '~/user_callout'; - -document.addEventListener('DOMContentLoaded', () => new UserCallout()); diff --git a/app/assets/javascripts/pages/instance_statistics/cohorts/index.js b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js new file mode 100644 index 00000000000..2d5020dbef4 --- /dev/null +++ b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js @@ -0,0 +1,3 @@ +import initUsagePing from './usage_ping'; + +document.addEventListener('DOMContentLoaded', initUsagePing); diff --git a/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js new file mode 100644 index 00000000000..914a9661c27 --- /dev/null +++ b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js @@ -0,0 +1,13 @@ +import axios from '../../../lib/utils/axios_utils'; +import { __ } from '../../../locale'; +import flash from '../../../flash'; + +export default function UsagePing() { + const el = document.querySelector('.usage-data'); + + axios.get(el.dataset.endpoint, { + responseType: 'text', + }).then(({ data }) => { + el.innerHTML = data; + }).catch(() => flash(__('Error fetching usage ping data.'))); +} diff --git a/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js new file mode 100644 index 00000000000..c1056537f90 --- /dev/null +++ b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js @@ -0,0 +1,3 @@ +import UserCallout from '~/user_callout'; + +document.addEventListener('DOMContentLoaded', () => new UserCallout()); -- cgit v1.2.1 From 401bcf043cb298fd074f94719dec263af2823bbd Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 14 Aug 2018 23:18:27 +0100 Subject: Rename conv dev index show action to index action in js pages dir --- .../instance_statistics/conversational_development_index/index.js | 3 +++ .../instance_statistics/conversational_development_index/show/index.js | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js delete mode 100644 app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js diff --git a/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js new file mode 100644 index 00000000000..c1056537f90 --- /dev/null +++ b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js @@ -0,0 +1,3 @@ +import UserCallout from '~/user_callout'; + +document.addEventListener('DOMContentLoaded', () => new UserCallout()); diff --git a/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js deleted file mode 100644 index c1056537f90..00000000000 --- a/app/assets/javascripts/pages/instance_statistics/conversational_development_index/show/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import UserCallout from '~/user_callout'; - -document.addEventListener('DOMContentLoaded', () => new UserCallout()); -- cgit v1.2.1 From 2cfa4f4888dd753d62a3f42cd02860828f1b0f56 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 14 Aug 2018 23:51:24 +0100 Subject: Add test for usage ping js in cohorts_spec --- spec/features/instance_statistics/cohorts_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/instance_statistics/cohorts_spec.rb index 81fc5eff980..573f8600be1 100644 --- a/spec/features/instance_statistics/cohorts_spec.rb +++ b/spec/features/instance_statistics/cohorts_spec.rb @@ -12,4 +12,12 @@ describe 'Cohorts page' do expect(page).to have_content("#{Time.now.strftime('%b %Y')} 3 0") end + + it 'shows usage data', :js do + visit instance_statistics_cohorts_path + + wait_for_requests + + expect(find('.js-syntax-highlight').text).not_to eq('') + end end -- cgit v1.2.1 From 02fda22f19b21666323df545d3f817a7f66a1b6a Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 14 Aug 2018 23:57:21 +0100 Subject: add test for convdev index user callout --- .../conversational_development_index_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/features/instance_statistics/conversational_development_index_spec.rb b/spec/features/instance_statistics/conversational_development_index_spec.rb index d441a7a5af9..a6c16b6a2a3 100644 --- a/spec/features/instance_statistics/conversational_development_index_spec.rb +++ b/spec/features/instance_statistics/conversational_development_index_spec.rb @@ -5,6 +5,16 @@ describe 'Conversational Development Index' do sign_in(create(:admin)) end + it 'has dismissable intro callout', :js do + visit instance_statistics_conversational_development_index_index_path + + expect(page).to have_content 'Introducing Your Conversational Development Index' + + find('.js-close-callout').click + + expect(page).not_to have_content 'Introducing Your Conversational Development Index' + end + context 'when usage ping is disabled' do it 'shows empty state' do stub_application_setting(usage_ping_enabled: false) -- cgit v1.2.1 From 182f1eeb27d63541141f339b54501cc821b8e0e9 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Thu, 16 Aug 2018 10:35:19 +0100 Subject: add changelog --- ...ance-statistics-convdev-index-intro-banner-is-not-dismissable.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml diff --git a/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml b/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml new file mode 100644 index 00000000000..50a3b9c9aff --- /dev/null +++ b/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml @@ -0,0 +1,5 @@ +--- +title: Fix issue stopping Instance Statistics javascript to be executed +merge_request: 21211 +author: +type: fixed -- cgit v1.2.1