From 27a6d65c616b58fdce5d7eba7a11b7ef7b2c8d28 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 15 Feb 2018 13:44:55 -0600 Subject: Add dispatcher imports for job details bundle --- app/assets/javascripts/dispatcher.js | 5 +++++ app/assets/javascripts/jobs/job_details_bundle.js | 4 ++-- app/assets/javascripts/pages/projects/jobs/show/index.js | 3 +++ app/views/projects/jobs/show.html.haml | 4 ---- config/webpack.config.js | 4 +--- 5 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/pages/projects/jobs/show/index.js diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index e4288dc1317..2e5209c6bf1 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -192,6 +192,11 @@ var Dispatcher; .catch(fail); shortcut_handler = true; break; + case 'projects:jobs:show': + import('./pages/projects/jobs/show') + .then(callDefault) + .catch(fail); + break; case 'projects:merge_requests:creations:new': import('./pages/projects/merge_requests/creations/new') .then(callDefault) diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js index db53b04de0e..85a88ae409b 100644 --- a/app/assets/javascripts/jobs/job_details_bundle.js +++ b/app/assets/javascripts/jobs/job_details_bundle.js @@ -3,7 +3,7 @@ import JobMediator from './job_details_mediator'; import jobHeader from './components/header.vue'; import detailsBlock from './components/sidebar_details_block.vue'; -document.addEventListener('DOMContentLoaded', () => { +export default () => { const dataset = document.getElementById('js-job-details-vue').dataset; const mediator = new JobMediator({ endpoint: dataset.endpoint }); @@ -55,4 +55,4 @@ document.addEventListener('DOMContentLoaded', () => { }); }, }); -}); +}; diff --git a/app/assets/javascripts/pages/projects/jobs/show/index.js b/app/assets/javascripts/pages/projects/jobs/show/index.js new file mode 100644 index 00000000000..cecbfb82946 --- /dev/null +++ b/app/assets/javascripts/pages/projects/jobs/show/index.js @@ -0,0 +1,3 @@ +import initJobDetails from '~/jobs/job_details_bundle'; + +export default initJobDetails; diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 93efa7e8e86..849c273db8c 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -112,7 +112,3 @@ .js-build-options{ data: javascript_build_options } #js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json) } } - -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('job_details') diff --git a/config/webpack.config.js b/config/webpack.config.js index 3fff808f166..edf5256aadc 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -68,7 +68,6 @@ var config = { help: './help/help.js', how_to_merge: './how_to_merge.js', issue_show: './issue_show/index.js', - job_details: './jobs/job_details_bundle.js', locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', @@ -155,7 +154,7 @@ var config = { include: /node_modules\/katex\/dist/, use: [ { loader: 'style-loader' }, - { + { loader: 'css-loader', options: { name: '[name].[hash].[ext]' @@ -263,7 +262,6 @@ var config = { 'filtered_search', 'groups', 'issue_show', - 'job_details', 'merge_conflicts', 'monitoring', 'notebook_viewer', -- cgit v1.2.1