Commit 3acdf609 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'cngo-move-issuable_show' into 'master'

Move ~/issuable_show to ~/vue_shared

See merge request gitlab-org/gitlab!76150
parents 471ec46d 79df7a56
...@@ -3,7 +3,7 @@ import { GlButton, GlDropdown, GlDropdownItem, GlLink, GlModal } from '@gitlab/u ...@@ -3,7 +3,7 @@ import { GlButton, GlDropdown, GlDropdownItem, GlLink, GlModal } from '@gitlab/u
import { mapActions, mapGetters, mapState } from 'vuex'; import { mapActions, mapGetters, mapState } from 'vuex';
import createFlash, { FLASH_TYPES } from '~/flash'; import createFlash, { FLASH_TYPES } from '~/flash';
import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
import { IssuableType } from '~/issuable_show/constants'; import { IssuableType } from '~/vue_shared/issuable/show/constants';
import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants'; import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants';
import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
......
import loadAwardsHandler from '~/awards_handler'; import loadAwardsHandler from '~/awards_handler';
import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
import initIssuableSidebar from '~/init_issuable_sidebar'; import initIssuableSidebar from '~/init_issuable_sidebar';
import { IssuableType } from '~/issuable_show/constants'; import { IssuableType } from '~/vue_shared/issuable/show/constants';
import Issue from '~/issue'; import Issue from '~/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';
......
...@@ -7,7 +7,7 @@ import { fetchIssue } from 'ee/integrations/jira/issues_show/api'; ...@@ -7,7 +7,7 @@ import { fetchIssue } from 'ee/integrations/jira/issues_show/api';
import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue'; import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue';
import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants'; import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
......
...@@ -7,7 +7,7 @@ import { fetchIssue } from 'ee/integrations/zentao/issues_show/api'; ...@@ -7,7 +7,7 @@ import { fetchIssue } from 'ee/integrations/zentao/issues_show/api';
import ZentaoIssueSidebar from 'ee/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root.vue'; import ZentaoIssueSidebar from 'ee/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root.vue';
import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants'; import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
......
...@@ -9,7 +9,7 @@ import { ...@@ -9,7 +9,7 @@ import {
} from '@gitlab/ui'; } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableBody from '~/vue_shared/issuable/show/components/issuable_body.vue';
import { TAB_KEY_CODE } from '~/lib/utils/keycodes'; import { TAB_KEY_CODE } from '~/lib/utils/keycodes';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
......
...@@ -11,8 +11,8 @@ import { ...@@ -11,8 +11,8 @@ import {
} from '@gitlab/ui'; } from '@gitlab/ui';
import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { getIdFromGraphQLId } from '~/graphql_shared/utils';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import IssuableEventHub from '~/issuable_show/event_hub'; import IssuableEventHub from '~/vue_shared/issuable/show/event_hub';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
import TestCaseGraphQL from '../mixins/test_case_graphql'; import TestCaseGraphQL from '../mixins/test_case_graphql';
......
...@@ -6,8 +6,8 @@ import JiraIssuesShow from 'ee/integrations/jira/issues_show/components/jira_iss ...@@ -6,8 +6,8 @@ import JiraIssuesShow from 'ee/integrations/jira/issues_show/components/jira_iss
import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue'; import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue';
import { IssuableStatus } from '~/issues/show/constants'; import { IssuableStatus } from '~/issues/show/constants';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/vue_shared/issuable/show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { mockJiraIssue } from '../mock_data'; import { mockJiraIssue } from '../mock_data';
......
...@@ -6,9 +6,9 @@ import ZentaoIssuesShow from 'ee/integrations/zentao/issues_show/components/zent ...@@ -6,9 +6,9 @@ import ZentaoIssuesShow from 'ee/integrations/zentao/issues_show/components/zent
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/vue_shared/issuable/show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import IssuableDiscussion from '~/issuable_show/components/issuable_discussion.vue'; import IssuableDiscussion from '~/vue_shared/issuable/show/components/issuable_discussion.vue';
import Note from 'ee/external_issues_show/components/note.vue'; import Note from 'ee/external_issues_show/components/note.vue';
import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
......
...@@ -9,8 +9,8 @@ import RequirementStatusBadge from 'ee/requirements/components/requirement_statu ...@@ -9,8 +9,8 @@ import RequirementStatusBadge from 'ee/requirements/components/requirement_statu
import { TestReportStatus } from 'ee/requirements/constants'; import { TestReportStatus } from 'ee/requirements/constants';
import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableBody from '~/vue_shared/issuable/show/components/issuable_body.vue';
import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; import IssuableEditForm from '~/vue_shared/issuable/show/components/issuable_edit_form.vue';
import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import MarkdownField from '~/vue_shared/components/markdown/field.vue';
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
......
...@@ -5,16 +5,16 @@ import TestCaseShowRoot from 'ee/test_case_show/components/test_case_show_root.v ...@@ -5,16 +5,16 @@ import TestCaseShowRoot from 'ee/test_case_show/components/test_case_show_root.v
import TestCaseSidebar from 'ee/test_case_show/components/test_case_sidebar.vue'; import TestCaseSidebar from 'ee/test_case_show/components/test_case_sidebar.vue';
import { mockCurrentUserTodo } from 'jest/vue_shared/issuable/list/mock_data'; import { mockCurrentUserTodo } from 'jest/vue_shared/issuable/list/mock_data';
import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableBody from '~/vue_shared/issuable/show/components/issuable_body.vue';
import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; import IssuableEditForm from '~/vue_shared/issuable/show/components/issuable_edit_form.vue';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/vue_shared/issuable/show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import IssuableEventHub from '~/issuable_show/event_hub'; import IssuableEventHub from '~/vue_shared/issuable/show/event_hub';
import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import { mockProvide, mockTestCase } from '../mock_data'; import { mockProvide, mockTestCase } from '../mock_data';
jest.mock('~/issuable_show/event_hub'); jest.mock('~/vue_shared/issuable/show/event_hub');
const createComponent = ({ testCase, testCaseQueryLoading = false } = {}) => const createComponent = ({ testCase, testCaseQueryLoading = false } = {}) =>
shallowMount(TestCaseShowRoot, { shallowMount(TestCaseShowRoot, {
......
...@@ -2,7 +2,7 @@ import { GlButton, GlDropdown, GlDropdownItem, GlLink, GlModal } from '@gitlab/u ...@@ -2,7 +2,7 @@ import { GlButton, GlDropdown, GlDropdownItem, GlLink, GlModal } from '@gitlab/u
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { createLocalVue, shallowMount } from '@vue/test-utils';
import Vuex from 'vuex'; import Vuex from 'vuex';
import createFlash, { FLASH_TYPES } from '~/flash'; import createFlash, { FLASH_TYPES } from '~/flash';
import { IssuableType } from '~/issuable_show/constants'; import { IssuableType } from '~/vue_shared/issuable/show/constants';
import HeaderActions from '~/issues/show/components/header_actions.vue'; import HeaderActions from '~/issues/show/components/header_actions.vue';
import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants'; import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants';
import promoteToEpicMutation from '~/issues/show/queries/promote_to_epic.mutation.graphql'; import promoteToEpicMutation from '~/issues/show/queries/promote_to_epic.mutation.graphql';
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { useFakeDate } from 'helpers/fake_date'; import { useFakeDate } from 'helpers/fake_date';
import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableBody from '~/vue_shared/issuable/show/components/issuable_body.vue';
import IssuableDescription from '~/issuable_show/components/issuable_description.vue'; import IssuableDescription from '~/vue_shared/issuable/show/components/issuable_description.vue';
import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; import IssuableEditForm from '~/vue_shared/issuable/show/components/issuable_edit_form.vue';
import IssuableTitle from '~/issuable_show/components/issuable_title.vue'; import IssuableTitle from '~/vue_shared/issuable/show/components/issuable_title.vue';
import TaskList from '~/task_list'; import TaskList from '~/task_list';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import $ from 'jquery'; import $ from 'jquery';
import IssuableDescription from '~/issuable_show/components/issuable_description.vue'; import IssuableDescription from '~/vue_shared/issuable/show/components/issuable_description.vue';
import { mockIssuable } from '../mock_data'; import { mockIssuable } from '../mock_data';
......
import { GlFormInput } from '@gitlab/ui'; import { GlFormInput } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; import IssuableEditForm from '~/vue_shared/issuable/show/components/issuable_edit_form.vue';
import IssuableEventHub from '~/issuable_show/event_hub'; import IssuableEventHub from '~/vue_shared/issuable/show/event_hub';
import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import MarkdownField from '~/vue_shared/components/markdown/field.vue';
import { mockIssuableShowProps, mockIssuable } from '../mock_data'; import { mockIssuableShowProps, mockIssuable } from '../mock_data';
......
...@@ -2,7 +2,7 @@ import { GlIcon, GlAvatarLabeled } from '@gitlab/ui'; ...@@ -2,7 +2,7 @@ import { GlIcon, GlAvatarLabeled } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/vue_shared/issuable/show/components/issuable_header.vue';
import { mockIssuableShowProps, mockIssuable } from '../mock_data'; import { mockIssuableShowProps, mockIssuable } from '../mock_data';
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableBody from '~/vue_shared/issuable/show/components/issuable_body.vue';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/vue_shared/issuable/show/components/issuable_header.vue';
import IssuableShowRoot from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShowRoot from '~/vue_shared/issuable/show/components/issuable_show_root.vue';
import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
......
...@@ -2,7 +2,7 @@ import { GlIcon, GlButton, GlIntersectionObserver } from '@gitlab/ui'; ...@@ -2,7 +2,7 @@ import { GlIcon, GlButton, GlIntersectionObserver } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
import IssuableTitle from '~/issuable_show/components/issuable_title.vue'; import IssuableTitle from '~/vue_shared/issuable/show/components/issuable_title.vue';
import { mockIssuableShowProps, mockIssuable } from '../mock_data'; import { mockIssuableShowProps, mockIssuable } from '../mock_data';
......
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