diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/import_entities/components/import_status.vue | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/import_entities/components/import_status.vue')
-rw-r--r-- | app/assets/javascripts/import_entities/components/import_status.vue | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue index bd69165f0ca..db677c574d1 100644 --- a/app/assets/javascripts/import_entities/components/import_status.vue +++ b/app/assets/javascripts/import_entities/components/import_status.vue @@ -7,13 +7,21 @@ import { STATUSES } from '../constants'; const STATISTIC_ITEMS = { diff_note: __('Diff notes'), issue: __('Issues'), + issue_attachment: s__('GithubImporter|Issue attachments'), + issue_event: __('Issue events'), label: __('Labels'), + lfs_object: __('LFS objects'), + merge_request_attachment: s__('GithubImporter|Merge request attachments'), milestone: __('Milestones'), note: __('Notes'), + note_attachment: s__('GithubImporter|Note attachments'), + protected_branch: __('Protected branches'), pull_request: s__('GithubImporter|Pull requests'), pull_request_merged_by: s__('GithubImporter|PR mergers'), pull_request_review: s__('GithubImporter|PR reviews'), + pull_request_review_request: s__('GithubImporter|PR reviews'), release: __('Releases'), + release_attachment: s__('GithubImporter|Release attachments'), }; // support both camel case and snake case versions @@ -93,18 +101,17 @@ export default { mappedStatus() { if (this.status === STATUSES.FINISHED) { const isIncomplete = this.stats && isIncompleteImport(this.stats); - return { - icon: 'status-success', - ...(isIncomplete - ? { - text: __('Partial import'), - variant: 'warning', - } - : { - text: __('Complete'), - variant: 'success', - }), - }; + return isIncomplete + ? { + icon: 'status-alert', + text: __('Partial import'), + variant: 'warning', + } + : { + icon: 'status-success', + text: __('Complete'), + variant: 'success', + }; } return STATUS_MAP[this.status]; @@ -120,6 +127,8 @@ export default { return { name: 'status-success', class: 'gl-text-green-400' }; } else if (imported === 0) { return { name: 'status-scheduled', class: 'gl-text-gray-400' }; + } else if (this.status === STATUSES.FINISHED) { + return { name: 'status-alert', class: 'gl-text-orange-400' }; } return { name: 'status-running', class: 'gl-text-blue-400' }; |