Commit 6f962089 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'cngo-move-issues-issuable-code' into 'master'

Move JS code into ~/issuable and ~/issues

See merge request gitlab-org/gitlab!76245
parents 4862587e 6e6bdb78
/* eslint-disable no-useless-return */
import $ from 'jquery'; import $ from 'jquery';
import TemplateSelector from '~/blob/template_selector';
import { __ } from '~/locale'; import { __ } from '~/locale';
import Api from '../api'; import Api from '../api';
import TemplateSelector from '../blob/template_selector';
export default class IssuableTemplateSelector extends TemplateSelector { export default class IssuableTemplateSelector extends TemplateSelector {
constructor(...args) { constructor(...args) {
...@@ -109,7 +107,5 @@ export default class IssuableTemplateSelector extends TemplateSelector { ...@@ -109,7 +107,5 @@ export default class IssuableTemplateSelector extends TemplateSelector {
} else { } else {
this.setEditorContent(this.currentTemplate, { skipFocus: false }); this.setEditorContent(this.currentTemplate, { skipFocus: false });
} }
return;
} }
} }
/* eslint-disable no-new, class-methods-use-this */
import $ from 'jquery'; import $ from 'jquery';
import IssuableTemplateSelector from './issuable_template_selector'; import IssuableTemplateSelector from './issuable_template_selector';
...@@ -10,6 +8,8 @@ export default class IssuableTemplateSelectors { ...@@ -10,6 +8,8 @@ export default class IssuableTemplateSelectors {
this.$dropdowns.each((i, dropdown) => { this.$dropdowns.each((i, dropdown) => {
const $dropdown = $(dropdown); const $dropdown = $(dropdown);
// eslint-disable-next-line no-new
new IssuableTemplateSelector({ new IssuableTemplateSelector({
pattern: /(\.md)/, pattern: /(\.md)/,
data: $dropdown.data('data'), data: $dropdown.data('data'),
...@@ -21,6 +21,7 @@ export default class IssuableTemplateSelectors { ...@@ -21,6 +21,7 @@ export default class IssuableTemplateSelectors {
}); });
} }
// eslint-disable-next-line class-methods-use-this
initEditor() { initEditor() {
const editor = $('.markdown-area'); const editor = $('.markdown-area');
// Proxy ace-editor's .setValue to jQuery's .val // Proxy ace-editor's .setValue to jQuery's .val
......
import $ from 'jquery'; import $ from 'jquery';
import { joinPaths } from '~/lib/utils/url_utility'; import { joinPaths } from '~/lib/utils/url_utility';
import CreateMergeRequestDropdown from './create_merge_request_dropdown'; import CreateMergeRequestDropdown from '~/create_merge_request_dropdown';
import createFlash from './flash'; import createFlash from '~/flash';
import { EVENT_ISSUABLE_VUE_APP_CHANGE } from './issuable/constants'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
import axios from './lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { addDelimiter } from './lib/utils/text_utility'; import { addDelimiter } from '~/lib/utils/text_utility';
import { __ } from './locale'; import { __ } from '~/locale';
export default class Issue { export default class Issue {
constructor() { constructor() {
......
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors';
export default { export default {
components: { components: {
......
...@@ -11,7 +11,7 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -11,7 +11,7 @@ import axios from '~/lib/utils/axios_utils';
import { scrollToElement, historyPushState } from '~/lib/utils/common_utils'; import { scrollToElement, historyPushState } from '~/lib/utils/common_utils';
import { setUrlParams, queryToObject, getParameterByName } from '~/lib/utils/url_utility'; import { setUrlParams, queryToObject, getParameterByName } from '~/lib/utils/url_utility';
import { __ } from '~/locale'; import { __ } from '~/locale';
import initManualOrdering from '~/manual_ordering'; import initManualOrdering from '~/issues/manual_ordering';
import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
import { import {
sortOrderMap, sortOrderMap,
......
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
import initManualOrdering from '~/manual_ordering'; import initManualOrdering from '~/issues/manual_ordering';
import { FILTERED_SEARCH } from '~/filtered_search/constants'; import { FILTERED_SEARCH } from '~/filtered_search/constants';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import projectSelect from '~/project_select'; import projectSelect from '~/project_select';
......
import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar'; import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
import { mountIssuablesListApp, mountIssuesListApp } from '~/issues_list'; import { mountIssuablesListApp, mountIssuesListApp } from '~/issues_list';
import initManualOrdering from '~/manual_ordering'; import initManualOrdering from '~/issues/manual_ordering';
import { FILTERED_SEARCH } from '~/filtered_search/constants'; import { FILTERED_SEARCH } from '~/filtered_search/constants';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import projectSelect from '~/project_select'; import projectSelect from '~/project_select';
......
...@@ -8,7 +8,7 @@ import initSuggestions from '~/issues/suggestions'; ...@@ -8,7 +8,7 @@ import initSuggestions from '~/issues/suggestions';
import initIssuableTypeSelector from '~/issues/type_selector'; import initIssuableTypeSelector from '~/issues/type_selector';
import LabelsSelect from '~/labels/labels_select'; import LabelsSelect from '~/labels/labels_select';
import MilestoneSelect from '~/milestones/milestone_select'; import MilestoneSelect from '~/milestones/milestone_select';
import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors';
export default () => { export default () => {
new ShortcutsNavigation(); new ShortcutsNavigation();
......
...@@ -4,7 +4,7 @@ import initCsvImportExportButtons from '~/issuable/init_csv_import_export_button ...@@ -4,7 +4,7 @@ import initCsvImportExportButtons from '~/issuable/init_csv_import_export_button
import initIssuableByEmail from '~/issuable/init_issuable_by_email'; import initIssuableByEmail from '~/issuable/init_issuable_by_email';
import IssuableIndex from '~/issuable/issuable_index'; import IssuableIndex from '~/issuable/issuable_index';
import { mountIssuablesListApp, mountIssuesListApp, mountJiraIssuesListApp } from '~/issues_list'; import { mountIssuablesListApp, mountIssuesListApp, mountJiraIssuesListApp } from '~/issues_list';
import initManualOrdering from '~/manual_ordering'; import initManualOrdering from '~/issues/manual_ordering';
import { FILTERED_SEARCH } from '~/filtered_search/constants'; import { FILTERED_SEARCH } from '~/filtered_search/constants';
import { ISSUABLE_INDEX } from '~/issuable/constants'; import { ISSUABLE_INDEX } from '~/issuable/constants';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
......
...@@ -2,7 +2,7 @@ import loadAwardsHandler from '~/awards_handler'; ...@@ -2,7 +2,7 @@ import loadAwardsHandler from '~/awards_handler';
import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
import initIssuableSidebar from '~/issuable/init_issuable_sidebar'; import initIssuableSidebar from '~/issuable/init_issuable_sidebar';
import { IssuableType } from '~/vue_shared/issuable/show/constants'; import { IssuableType } from '~/vue_shared/issuable/show/constants';
import Issue from '~/issue'; import Issue from '~/issues/issue';
import { initIncidentApp, initIncidentHeaderActions } from '~/issues/show/incident'; import { initIncidentApp, initIncidentHeaderActions } from '~/issues/show/incident';
import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue'; import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue';
import { parseIssuableData } from '~/issues/show/utils/parse_data'; import { parseIssuableData } from '~/issues/show/utils/parse_data';
......
...@@ -7,7 +7,7 @@ import Diff from '~/diff'; ...@@ -7,7 +7,7 @@ import Diff from '~/diff';
import GLForm from '~/gl_form'; import GLForm from '~/gl_form';
import LabelsSelect from '~/labels/labels_select'; import LabelsSelect from '~/labels/labels_select';
import MilestoneSelect from '~/milestones/milestone_select'; import MilestoneSelect from '~/milestones/milestone_select';
import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors';
export default () => { export default () => {
new Diff(); new Diff();
......
import { getByText } from '@testing-library/dom'; import { getByText } from '@testing-library/dom';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
import Issue from '~/issue'; import Issue from '~/issues/issue';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
describe('Issue', () => { describe('Issue', () => {
......
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