Commit 5ea92bd6 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'kp-rename-jira-issuables-list-app' into 'master'

Rename `issuables_list` app to `issues_list`

See merge request gitlab-org/gitlab!42366
parents 188d4271 6b9c0b26
...@@ -7,7 +7,7 @@ import MilestoneSelect from './milestone_select'; ...@@ -7,7 +7,7 @@ import MilestoneSelect from './milestone_select';
import issueStatusSelect from './issue_status_select'; import issueStatusSelect from './issue_status_select';
import subscriptionSelect from './subscription_select'; import subscriptionSelect from './subscription_select';
import LabelsSelect from './labels_select'; import LabelsSelect from './labels_select';
import issueableEventHub from './issuables_list/eventhub'; import issueableEventHub from './issues_list/eventhub';
const HIDDEN_CLASS = 'hidden'; const HIDDEN_CLASS = 'hidden';
const DISABLED_CONTENT_CLASS = 'disabled-content'; const DISABLED_CONTENT_CLASS = 'disabled-content';
......
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
} from '~/jira_import/utils/jira_import_utils'; } from '~/jira_import/utils/jira_import_utils';
export default { export default {
name: 'IssuableListRoot', name: 'JiraIssuesList',
components: { components: {
GlAlert, GlAlert,
GlLabel, GlLabel,
......
...@@ -2,10 +2,10 @@ import Vue from 'vue'; ...@@ -2,10 +2,10 @@ import Vue from 'vue';
import VueApollo from 'vue-apollo'; import VueApollo from 'vue-apollo';
import createDefaultClient from '~/lib/graphql'; import createDefaultClient from '~/lib/graphql';
import { parseBoolean, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { parseBoolean, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import IssuableListRootApp from './components/issuable_list_root_app.vue'; import JiraIssuesListRoot from './components/jira_issues_list_root.vue';
import IssuablesListApp from './components/issuables_list_app.vue'; import IssuablesListApp from './components/issuables_list_app.vue';
function mountIssuableListRootApp() { function mountJiraIssuesListApp() {
const el = document.querySelector('.js-projects-issues-root'); const el = document.querySelector('.js-projects-issues-root');
if (!el) { if (!el) {
...@@ -23,7 +23,7 @@ function mountIssuableListRootApp() { ...@@ -23,7 +23,7 @@ function mountIssuableListRootApp() {
el, el,
apolloProvider, apolloProvider,
render(createComponent) { render(createComponent) {
return createComponent(IssuableListRootApp, { return createComponent(JiraIssuesListRoot, {
props: { props: {
canEdit: parseBoolean(el.dataset.canEdit), canEdit: parseBoolean(el.dataset.canEdit),
isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured), isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured),
...@@ -62,6 +62,6 @@ function mountIssuablesListApp() { ...@@ -62,6 +62,6 @@ function mountIssuablesListApp() {
} }
export default function initIssuablesList() { export default function initIssuablesList() {
mountIssuableListRootApp(); mountJiraIssuesListApp();
mountIssuablesListApp(); mountIssuablesListApp();
} }
import { last } from 'lodash'; import { last } from 'lodash';
import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issuables_list/constants'; import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants';
export const IMPORT_STATE = { export const IMPORT_STATE = {
FAILED: 'failed', FAILED: 'failed',
......
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 initIssuablesList from '~/issuables_list'; import initIssuablesList from '~/issues_list';
import projectSelect from '~/project_select'; import projectSelect from '~/project_select';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar';
......
import initIssuablesList from '~/issuables_list'; import initIssuablesList from '~/issues_list';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
initIssuablesList(); initIssuablesList();
......
...@@ -7,7 +7,7 @@ import UsersSelect from '~/users_select'; ...@@ -7,7 +7,7 @@ import UsersSelect from '~/users_select';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import { FILTERED_SEARCH } from '~/pages/constants'; import { FILTERED_SEARCH } from '~/pages/constants';
import { ISSUABLE_INDEX } from '~/pages/projects/constants'; import { ISSUABLE_INDEX } from '~/pages/projects/constants';
import initIssuablesList from '~/issuables_list'; import initIssuablesList from '~/issues_list';
import initManualOrdering from '~/manual_ordering'; import initManualOrdering from '~/manual_ordering';
import { showLearnGitLabIssuesPopover } from '~/onboarding_issues'; import { showLearnGitLabIssuesPopover } from '~/onboarding_issues';
......
import FilteredSearchServiceDesk from './filtered_search'; import FilteredSearchServiceDesk from './filtered_search';
import initIssuablesList from '~/issuables_list'; import initIssuablesList from '~/issues_list';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const supportBotData = JSON.parse( const supportBotData = JSON.parse(
......
...@@ -17,7 +17,7 @@ module QA ...@@ -17,7 +17,7 @@ module QA
element :issue_filter_input, /%input.form-control.filtered-search/ # rubocop:disable QA/ElementWithPattern element :issue_filter_input, /%input.form-control.filtered-search/ # rubocop:disable QA/ElementWithPattern
end end
view 'app/assets/javascripts/issuables_list/components/issuable.vue' do view 'app/assets/javascripts/issues_list/components/issuable.vue' do
element :issuable_weight_content element :issuable_weight_content
end end
end end
......
...@@ -5,7 +5,7 @@ module QA ...@@ -5,7 +5,7 @@ module QA
module Project module Project
module Issue module Issue
class Index < Page::Base class Index < Page::Base
view 'app/assets/javascripts/issuables_list/components/issuable.vue' do view 'app/assets/javascripts/issues_list/components/issuable.vue' do
element :issue_container element :issue_container
element :issue_link element :issue_link
end end
......
...@@ -5,7 +5,7 @@ import { trimText } from 'helpers/text_helper'; ...@@ -5,7 +5,7 @@ import { trimText } from 'helpers/text_helper';
import initUserPopovers from '~/user_popovers'; import initUserPopovers from '~/user_popovers';
import { formatDate } from '~/lib/utils/datetime_utility'; import { formatDate } from '~/lib/utils/datetime_utility';
import { mergeUrlParams } from '~/lib/utils/url_utility'; import { mergeUrlParams } from '~/lib/utils/url_utility';
import Issuable from '~/issuables_list/components/issuable.vue'; import Issuable from '~/issues_list/components/issuable.vue';
import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
import { simpleIssue, testAssignees, testLabels } from '../issuable_list_test_data'; import { simpleIssue, testAssignees, testLabels } from '../issuable_list_test_data';
import { isScopedLabel } from '~/lib/utils/common_utils'; import { isScopedLabel } from '~/lib/utils/common_utils';
......
...@@ -9,14 +9,14 @@ import { ...@@ -9,14 +9,14 @@ import {
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import { TEST_HOST } from 'helpers/test_constants'; import { TEST_HOST } from 'helpers/test_constants';
import { deprecatedCreateFlash as flash } from '~/flash'; import { deprecatedCreateFlash as flash } from '~/flash';
import IssuablesListApp from '~/issuables_list/components/issuables_list_app.vue'; import IssuablesListApp from '~/issues_list/components/issuables_list_app.vue';
import Issuable from '~/issuables_list/components/issuable.vue'; import Issuable from '~/issues_list/components/issuable.vue';
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 issueablesEventBus from '~/issuables_list/eventhub'; import issueablesEventBus from '~/issues_list/eventhub';
import { PAGE_SIZE, PAGE_SIZE_MANUAL, RELATIVE_POSITION } from '~/issuables_list/constants'; import { PAGE_SIZE, PAGE_SIZE_MANUAL, RELATIVE_POSITION } from '~/issues_list/constants';
jest.mock('~/flash'); jest.mock('~/flash');
jest.mock('~/issuables_list/eventhub'); jest.mock('~/issues_list/eventhub');
jest.mock('~/lib/utils/common_utils', () => ({ jest.mock('~/lib/utils/common_utils', () => ({
...jest.requireActual('~/lib/utils/common_utils'), ...jest.requireActual('~/lib/utils/common_utils'),
scrollToElement: () => {}, scrollToElement: () => {},
......
import { GlAlert, GlLabel } from '@gitlab/ui'; import { GlAlert, GlLabel } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import IssuableListRootApp from '~/issuables_list/components/issuable_list_root_app.vue'; import JiraIssuesListRoot from '~/issues_list/components/jira_issues_list_root.vue';
describe('IssuableListRootApp', () => { describe('JiraIssuesListRoot', () => {
const issuesPath = 'gitlab-org/gitlab-test/-/issues'; const issuesPath = 'gitlab-org/gitlab-test/-/issues';
const label = { const label = {
color: '#333', color: '#333',
...@@ -19,7 +19,7 @@ describe('IssuableListRootApp', () => { ...@@ -19,7 +19,7 @@ describe('IssuableListRootApp', () => {
shouldShowFinishedAlert = false, shouldShowFinishedAlert = false,
shouldShowInProgressAlert = false, shouldShowInProgressAlert = false,
} = {}) => } = {}) =>
shallowMount(IssuableListRootApp, { shallowMount(JiraIssuesListRoot, {
propsData: { propsData: {
canEdit: true, canEdit: true,
isJiraConfigured: true, isJiraConfigured: true,
......
import { emptyStateHelper, generateMessages } from '~/issuables_list/service_desk_helper'; import { emptyStateHelper, generateMessages } from '~/issues_list/service_desk_helper';
describe('service desk helper', () => { describe('service desk helper', () => {
const emptyStateMessages = generateMessages({}); const emptyStateMessages = generateMessages({});
......
...@@ -8,7 +8,7 @@ import { ...@@ -8,7 +8,7 @@ import {
setFinishedAlertHideMap, setFinishedAlertHideMap,
shouldShowFinishedAlert, shouldShowFinishedAlert,
} from '~/jira_import/utils/jira_import_utils'; } from '~/jira_import/utils/jira_import_utils';
import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issuables_list/constants'; import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants';
useLocalStorageSpy(); useLocalStorageSpy();
......
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