Commit f582ff40 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'webpack-epics-bundle' into 'master'

Remove epic show and new epic webpack bundle tag

See merge request gitlab-org/gitlab-ee!4793
parents 50c66197 75bc547f
...@@ -68,8 +68,6 @@ function generateEntries() { ...@@ -68,8 +68,6 @@ function generateEntries() {
// EE-only // EE-only
add_gitlab_slack_application: 'ee/add_gitlab_slack_application/index.js', add_gitlab_slack_application: 'ee/add_gitlab_slack_application/index.js',
burndown_chart: 'ee/burndown_chart/index.js', burndown_chart: 'ee/burndown_chart/index.js',
epic_show: 'ee/epics/epic_show/epic_show_bundle.js',
new_epic: 'ee/epics/new_epic/new_epic_bundle.js',
geo_nodes: 'ee/geo_nodes', geo_nodes: 'ee/geo_nodes',
issuable: 'ee/issuable/issuable_bundle.js', issuable: 'ee/issuable/issuable_bundle.js',
issues: 'ee/issues/issues_bundle.js', issues: 'ee/issues/issues_bundle.js',
......
import Vue from 'vue'; import Vue from 'vue';
import EpicShowApp from './components/epic_show_app.vue'; import EpicShowApp from './components/epic_show_app.vue';
document.addEventListener('DOMContentLoaded', () => { export default () => {
const el = document.querySelector('#epic-show-app'); const el = document.querySelector('#epic-show-app');
const metaData = JSON.parse(el.dataset.meta); const metaData = JSON.parse(el.dataset.meta);
const initialData = JSON.parse(el.dataset.initial); const initialData = JSON.parse(el.dataset.initial);
...@@ -21,4 +21,4 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -21,4 +21,4 @@ document.addEventListener('DOMContentLoaded', () => {
props, props,
}), }),
}); });
}); };
import Vue from 'vue'; import Vue from 'vue';
import NewEpicApp from './components/new_epic.vue'; import NewEpicApp from './components/new_epic.vue';
document.addEventListener('DOMContentLoaded', () => { export default () => {
const el = document.querySelector('#new-epic-app'); const el = document.querySelector('#new-epic-app');
const props = el.dataset;
return new Vue({ if (el) {
el, const props = el.dataset;
components: {
'new-epic-app': NewEpicApp, new Vue({ // eslint-disable-line no-new
}, el,
render: createElement => createElement('new-epic-app', { components: {
props, 'new-epic-app': NewEpicApp,
}), },
}); render: createElement => createElement('new-epic-app', {
}); props,
}),
});
}
};
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import FilteredSearchTokenKeysEpics from 'ee/filtered_search/filtered_search_token_keys_epics'; import FilteredSearchTokenKeysEpics from 'ee/filtered_search/filtered_search_token_keys_epics';
import initNewEpic from 'ee/epics/new_epic/new_epic_bundle';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
initFilteredSearch({ initFilteredSearch({
...@@ -7,4 +8,5 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -7,4 +8,5 @@ document.addEventListener('DOMContentLoaded', () => {
filteredSearchTokenKeys: FilteredSearchTokenKeysEpics, filteredSearchTokenKeys: FilteredSearchTokenKeysEpics,
stateFiltersSelector: '.epics-state-filters', stateFiltersSelector: '.epics-state-filters',
}); });
initNewEpic();
}); });
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
import initEpicShow from 'ee/epics/epic_show/epic_show_bundle';
document.addEventListener('DOMContentLoaded', () => new ZenMode()); document.addEventListener('DOMContentLoaded', () => {
new ZenMode(); // eslint-disable-line no-new
initEpicShow();
});
import initNewEpic from 'ee/epics/new_epic/new_epic_bundle';
document.addEventListener('DOMContentLoaded', initNewEpic);
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
= render 'shared/issuable/epic_nav', type: :epics = render 'shared/issuable/epic_nav', type: :epics
.nav-controls .nav-controls
- if can?(current_user, :create_epic, @group) - if can?(current_user, :create_epic, @group)
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'new_epic'
#new-epic-app{ data: { endpoint: request.url, 'align-right' => true } } #new-epic-app{ data: { endpoint: request.url, 'align-right' => true } }
= render 'shared/epic/search_bar', type: :epics = render 'shared/epic/search_bar', type: :epics
......
...@@ -14,6 +14,5 @@ ...@@ -14,6 +14,5 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'epic_show'
#epic-show-app{ data: { initial: issuable_initial_data(@epic).to_json, meta: epic_meta_data } } #epic-show-app{ data: { initial: issuable_initial_data(@epic).to_json, meta: epic_meta_data } }
...@@ -11,5 +11,4 @@ ...@@ -11,5 +11,4 @@
- if can?(current_user, :create_epic, @group) - if can?(current_user, :create_epic, @group)
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'new_epic'
#new-epic-app{ data: { endpoint: request.url } } #new-epic-app{ data: { endpoint: request.url } }
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
- if can?(current_user, :create_epic, @group) - if can?(current_user, :create_epic, @group)
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'new_epic'
#new-epic-app{ data: { endpoint: request.url } } #new-epic-app{ data: { endpoint: request.url } }
= link_to group_epics_path(@group), title: 'List', class: 'btn' do = link_to group_epics_path(@group), title: 'List', class: 'btn' do
%span= _('View epics list') %span= _('View epics list')
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