diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 18:09:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 18:09:05 +0000 |
commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/assets/javascripts/releases | |
parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) | |
download | gitlab-ce-c2367afbf57ebc65d5b78a743b5d6a91f0aece9f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
11 files changed, 42 insertions, 35 deletions
diff --git a/app/assets/javascripts/releases/components/app_index.vue b/app/assets/javascripts/releases/components/app_index.vue index f602c9fdda2..b9e80899e25 100644 --- a/app/assets/javascripts/releases/components/app_index.vue +++ b/app/assets/javascripts/releases/components/app_index.vue @@ -76,7 +76,7 @@ export default { <div v-else-if="shouldRenderSuccessState" class="js-success-state"> <release-block v-for="(release, index) in releases" - :key="release.tag_name" + :key="release.tagName" :release="release" :class="{ 'linked-card': releases.length > 1 && index !== releases.length - 1 }" /> diff --git a/app/assets/javascripts/releases/components/evidence_block.vue b/app/assets/javascripts/releases/components/evidence_block.vue index d9abd195fee..edbea33f1d1 100644 --- a/app/assets/javascripts/releases/components/evidence_block.vue +++ b/app/assets/javascripts/releases/components/evidence_block.vue @@ -25,16 +25,16 @@ export default { }, computed: { evidenceTitle() { - return sprintf(__('%{tag}-evidence.json'), { tag: this.release.tag_name }); + return sprintf(__('%{tag}-evidence.json'), { tag: this.release.tagName }); }, evidenceUrl() { - return this.release.assets && this.release.assets.evidence_file_path; + return this.release.assets && this.release.assets.evidenceFilePath; }, shortSha() { return truncateSha(this.sha); }, sha() { - return this.release.evidence_sha; + return this.release.evidenceSha; }, }, }; diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index bc3f2c3bf30..f2cc36e38bb 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -38,13 +38,13 @@ export default { }, computed: { id() { - return slugify(this.release.tag_name); + return slugify(this.release.tagName); }, assets() { return this.release.assets || {}; }, hasEvidence() { - return Boolean(this.release.evidence_sha); + return Boolean(this.release.evidenceSha); }, milestones() { return this.release.milestones || []; @@ -102,7 +102,7 @@ export default { <evidence-block v-if="hasEvidence && shouldShowEvidence" :release="release" /> <div ref="gfm-content" class="card-text prepend-top-default"> - <div v-html="release.description_html"></div> + <div v-html="release.descriptionHtml"></div> </div> </div> @@ -110,11 +110,11 @@ export default { v-if="shouldShowFooter" class="card-footer" :commit="release.commit" - :commit-path="release.commit_path" - :tag-name="release.tag_name" - :tag-path="release.tag_path" + :commit-path="release.commitPath" + :tag-name="release.tagName" + :tag-path="release.tagPath" :author="release.author" - :released-at="release.released_at" + :released-at="release.releasedAt" /> </div> </template> diff --git a/app/assets/javascripts/releases/components/release_block_author.vue b/app/assets/javascripts/releases/components/release_block_author.vue index e7075d4d67a..0432d45b2dc 100644 --- a/app/assets/javascripts/releases/components/release_block_author.vue +++ b/app/assets/javascripts/releases/components/release_block_author.vue @@ -31,8 +31,8 @@ export default { <template #user> <user-avatar-link class="prepend-left-4" - :link-href="author.web_url" - :img-src="author.avatar_url" + :link-href="author.webUrl" + :img-src="author.avatarUrl" :img-alt="userImageAltDescription" :tooltip-text="author.username" /> diff --git a/app/assets/javascripts/releases/components/release_block_footer.vue b/app/assets/javascripts/releases/components/release_block_footer.vue index 8533fc17ffd..a95fbc0b373 100644 --- a/app/assets/javascripts/releases/components/release_block_footer.vue +++ b/app/assets/javascripts/releases/components/release_block_footer.vue @@ -66,9 +66,9 @@ export default { <icon ref="commitIcon" name="commit" class="mr-1" /> <div v-gl-tooltip.bottom :title="commit.title"> <gl-link v-if="commitPath" :href="commitPath"> - {{ commit.short_id }} + {{ commit.shortId }} </gl-link> - <span v-else>{{ commit.short_id }}</span> + <span v-else>{{ commit.shortId }}</span> </div> </div> @@ -100,8 +100,8 @@ export default { <div v-if="author" class="d-flex"> <span class="text-secondary">{{ __('by') }} </span> <user-avatar-link - :link-href="author.web_url" - :img-src="author.avatar_url" + :link-href="author.webUrl" + :img-src="author.avatarUrl" :img-alt="userImageAltDescription" :tooltip-text="author.username" tooltip-placement="bottom" diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue index b459418aef2..f0d3f3f8c1d 100644 --- a/app/assets/javascripts/releases/components/release_block_header.vue +++ b/app/assets/javascripts/releases/components/release_block_header.vue @@ -20,10 +20,10 @@ export default { }, computed: { editLink() { - return this.release._links?.edit_url; + return this.release.Links?.editUrl; }, selfLink() { - return this.release._links?.self; + return this.release.Links?.self; }, }, }; @@ -36,7 +36,7 @@ export default { {{ release.name }} </gl-link> <template v-else>{{ release.name }}</template> - <gl-badge v-if="release.upcoming_release" variant="warning" class="align-middle">{{ + <gl-badge v-if="release.upcomingRelease" variant="warning" class="align-middle">{{ __('Upcoming Release') }}</gl-badge> </h2> diff --git a/app/assets/javascripts/releases/components/release_block_metadata.vue b/app/assets/javascripts/releases/components/release_block_metadata.vue index f0aad594062..052e4088a5f 100644 --- a/app/assets/javascripts/releases/components/release_block_metadata.vue +++ b/app/assets/javascripts/releases/components/release_block_metadata.vue @@ -32,21 +32,21 @@ export default { return this.release.commit || {}; }, commitUrl() { - return this.release.commit_path; + return this.release.commitPath; }, hasAuthor() { return Boolean(this.author); }, releasedTimeAgo() { return sprintf(__('released %{time}'), { - time: this.timeFormatted(this.release.released_at), + time: this.timeFormatted(this.release.releasedAt), }); }, shouldRenderMilestones() { return Boolean(this.release.milestones?.length); }, tagUrl() { - return this.release.tag_path; + return this.release.tagPath; }, }, }; @@ -57,24 +57,24 @@ export default { <div class="append-right-8"> <icon name="commit" class="align-middle" /> <gl-link v-if="commitUrl" v-gl-tooltip.bottom :title="commit.title" :href="commitUrl"> - {{ commit.short_id }} + {{ commit.shortId }} </gl-link> - <span v-else v-gl-tooltip.bottom :title="commit.title">{{ commit.short_id }}</span> + <span v-else v-gl-tooltip.bottom :title="commit.title">{{ commit.shortId }}</span> </div> <div class="append-right-8"> <icon name="tag" class="align-middle" /> <gl-link v-if="tagUrl" v-gl-tooltip.bottom :title="__('Tag')" :href="tagUrl"> - {{ release.tag_name }} + {{ release.tagName }} </gl-link> - <span v-else v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span> + <span v-else v-gl-tooltip.bottom :title="__('Tag')">{{ release.tagName }}</span> </div> <release-block-milestones v-if="shouldRenderMilestones" :milestones="release.milestones" /> <div class="append-right-4"> • - <span v-gl-tooltip.bottom :title="tooltipTitle(release.released_at)"> + <span v-gl-tooltip.bottom :title="tooltipTitle(release.releasedAt)"> {{ releasedTimeAgo }} </span> </div> diff --git a/app/assets/javascripts/releases/components/release_block_milestone_info.vue b/app/assets/javascripts/releases/components/release_block_milestone_info.vue index d3e354d6157..50accf6b679 100644 --- a/app/assets/javascripts/releases/components/release_block_milestone_info.vue +++ b/app/assets/javascripts/releases/components/release_block_milestone_info.vue @@ -40,7 +40,7 @@ export default { return Number.isNaN(percent) ? 0 : percent; }, allIssueStats() { - return this.milestones.map(m => m.issue_stats || {}); + return this.milestones.map(m => m.issueStats || {}); }, openIssuesCount() { return this.allIssueStats.map(stats => stats.opened || 0).reduce(sumReducer); @@ -109,7 +109,7 @@ export default { :key="milestone.id" v-gl-tooltip :title="milestone.description" - :href="milestone.web_url" + :href="milestone.webUrl" class="append-right-4" > {{ milestone.title }} diff --git a/app/assets/javascripts/releases/components/release_block_milestones.vue b/app/assets/javascripts/releases/components/release_block_milestones.vue index a3dff75b828..9abd3345b22 100644 --- a/app/assets/javascripts/releases/components/release_block_milestones.vue +++ b/app/assets/javascripts/releases/components/release_block_milestones.vue @@ -38,7 +38,7 @@ export default { :key="milestone.id" v-gl-tooltip :title="milestone.description" - :href="milestone.web_url" + :href="milestone.webUrl" class="mx-1 js-milestone-link" > {{ milestone.title }} diff --git a/app/assets/javascripts/releases/stores/modules/detail/actions.js b/app/assets/javascripts/releases/stores/modules/detail/actions.js index c9749582f5c..f730af1c7dc 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/actions.js +++ b/app/assets/javascripts/releases/stores/modules/detail/actions.js @@ -22,8 +22,7 @@ export const fetchRelease = ({ dispatch, state }) => { return api .release(state.projectId, state.tagName) .then(({ data: release }) => { - const camelCasedRelease = convertObjectPropsToCamelCase(release, { deep: true }); - dispatch('receiveReleaseSuccess', camelCasedRelease); + dispatch('receiveReleaseSuccess', convertObjectPropsToCamelCase(release, { deep: true })); }) .catch(error => { dispatch('receiveReleaseError', error); diff --git a/app/assets/javascripts/releases/stores/modules/list/actions.js b/app/assets/javascripts/releases/stores/modules/list/actions.js index b15fb69226f..06d13890a9d 100644 --- a/app/assets/javascripts/releases/stores/modules/list/actions.js +++ b/app/assets/javascripts/releases/stores/modules/list/actions.js @@ -2,7 +2,11 @@ import * as types from './mutation_types'; import createFlash from '~/flash'; import { __ } from '~/locale'; import api from '~/api'; -import { normalizeHeaders, parseIntPagination } from '~/lib/utils/common_utils'; +import { + normalizeHeaders, + parseIntPagination, + convertObjectPropsToCamelCase, +} from '~/lib/utils/common_utils'; /** * Commits a mutation to update the state while the main endpoint is being requested. @@ -28,7 +32,11 @@ export const fetchReleases = ({ dispatch }, { page = '1', projectId }) => { export const receiveReleasesSuccess = ({ commit }, { data, headers }) => { const pageInfo = parseIntPagination(normalizeHeaders(headers)); - commit(types.RECEIVE_RELEASES_SUCCESS, { data, pageInfo }); + const camelCasedReleases = convertObjectPropsToCamelCase(data, { deep: true }); + commit(types.RECEIVE_RELEASES_SUCCESS, { + data: camelCasedReleases, + pageInfo, + }); }; export const receiveReleasesError = ({ commit }) => { |