diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/note.vue b/ee/app/assets/javascripts/external_issues_show/components/note.vue similarity index 96% rename from ee/app/assets/javascripts/integrations/jira/issues_show/components/note.vue rename to ee/app/assets/javascripts/external_issues_show/components/note.vue index ff7fbd75ad4b056d74be47fdd8ec313bafba817e..43a53febb5eb5f2b76145a4de8baf5d1c9f3fa76 100644 --- a/ee/app/assets/javascripts/integrations/jira/issues_show/components/note.vue +++ b/ee/app/assets/javascripts/external_issues_show/components/note.vue @@ -42,6 +42,11 @@ export default { required: false, default: undefined, }, + badgeText: { + type: String, + required: false, + default: '', + }, }, computed: { noteAnchor() { diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/assignee.vue b/ee/app/assets/javascripts/external_issues_show/components/sidebar/assignee.vue similarity index 100% rename from ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/assignee.vue rename to ee/app/assets/javascripts/external_issues_show/components/sidebar/assignee.vue diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_due_date.vue b/ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_due_date.vue similarity index 100% rename from ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_due_date.vue rename to ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_due_date.vue diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_field.vue b/ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_field.vue similarity index 100% rename from ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_field.vue rename to ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_field.vue diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_field_dropdown.vue b/ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_field_dropdown.vue similarity index 100% rename from ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/issue_field_dropdown.vue rename to ee/app/assets/javascripts/external_issues_show/components/sidebar/issue_field_dropdown.vue diff --git a/ee/app/assets/javascripts/external_issues_show/constants.js b/ee/app/assets/javascripts/external_issues_show/constants.js new file mode 100644 index 0000000000000000000000000000000000000000..29bb2dedfd2554649972bc02c93e426b19f7c994 --- /dev/null +++ b/ee/app/assets/javascripts/external_issues_show/constants.js @@ -0,0 +1,13 @@ +import { __ } from '~/locale'; + +export const issueStates = { + OPENED: 'opened', + CLOSED: 'closed', +}; + +export const issueStateLabels = { + [issueStates.OPENED]: __('Open'), + [issueStates.CLOSED]: __('Closed'), +}; + +export const labelsFilterParam = 'labels'; diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue b/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue index 760ef5e8b8ff86f2e58f6309f23c7a9dcc0705f1..bec8bd9a5153ee7d3cfcb12f735beb7cd98bd1fa 100644 --- a/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue +++ b/ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue @@ -7,6 +7,7 @@ import { GlBadge, GlTooltipDirective as GlTooltip, } from '@gitlab/ui'; +import Note from 'ee/external_issues_show/components/note.vue'; import { fetchIssue, fetchIssueStatuses, updateIssue } from 'ee/integrations/jira/issues_show/api'; import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue'; @@ -15,7 +16,6 @@ import createFlash from '~/flash'; import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; -import Note from './note.vue'; export default { name: 'JiraIssuesShow', diff --git a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue b/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue index d99938d1b584347c3b67435fed42783c7ec1e619..bdc2b28e1a70dd24d8148aeb02bd76e7392af936 100644 --- a/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue +++ b/ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue @@ -1,12 +1,12 @@