diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/releases | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/releases')
7 files changed, 30 insertions, 6 deletions
diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue index 3774f97a060..39140216bc5 100644 --- a/app/assets/javascripts/releases/components/app_edit_new.vue +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -1,8 +1,7 @@ <script> import { GlButton, GlFormInput, GlFormGroup, GlSprintf } from '@gitlab/ui'; import { mapState, mapActions, mapGetters } from 'vuex'; -import { getParameterByName } from '~/lib/utils/common_utils'; -import { isSameOriginUrl } from '~/lib/utils/url_utility'; +import { isSameOriginUrl, getParameterByName } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; import { BACK_URL_PARAM } from '~/releases/constants'; diff --git a/app/assets/javascripts/releases/components/app_index.vue b/app/assets/javascripts/releases/components/app_index.vue index 31d335fa15d..c2c91f406a1 100644 --- a/app/assets/javascripts/releases/components/app_index.vue +++ b/app/assets/javascripts/releases/components/app_index.vue @@ -1,7 +1,7 @@ <script> import { GlEmptyState, GlLink, GlButton } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; -import { getParameterByName } from '~/lib/utils/common_utils'; +import { getParameterByName } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import ReleaseBlock from './release_block.vue'; import ReleaseSkeletonLoader from './release_skeleton_loader.vue'; diff --git a/app/assets/javascripts/releases/components/app_index_apollo_client.vue b/app/assets/javascripts/releases/components/app_index_apollo_client.vue index ea0aa409577..f49c44a399f 100644 --- a/app/assets/javascripts/releases/components/app_index_apollo_client.vue +++ b/app/assets/javascripts/releases/components/app_index_apollo_client.vue @@ -1,12 +1,12 @@ <script> import { GlButton } from '@gitlab/ui'; +import allReleasesQuery from 'shared_queries/releases/all_releases.query.graphql'; import createFlash from '~/flash'; -import { historyPushState, getParameterByName } from '~/lib/utils/common_utils'; +import { historyPushState } from '~/lib/utils/common_utils'; import { scrollUp } from '~/lib/utils/scroll_utils'; -import { setUrlParams } from '~/lib/utils/url_utility'; +import { setUrlParams, getParameterByName } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import { PAGE_SIZE, DEFAULT_SORT } from '~/releases/constants'; -import allReleasesQuery from '~/releases/graphql/queries/all_releases.query.graphql'; import { convertAllReleasesGraphQLResponse } from '~/releases/util'; import ReleaseBlock from './release_block.vue'; import ReleaseSkeletonLoader from './release_skeleton_loader.vue'; diff --git a/app/assets/javascripts/releases/graphql/fragments/release.fragment.graphql b/app/assets/javascripts/releases/graphql/fragments/release.fragment.graphql index 3a742db7d9e..3a927dfc756 100644 --- a/app/assets/javascripts/releases/graphql/fragments/release.fragment.graphql +++ b/app/assets/javascripts/releases/graphql/fragments/release.fragment.graphql @@ -1,4 +1,5 @@ fragment Release on Release { + __typename name tagName tagPath @@ -7,15 +8,20 @@ fragment Release on Release { createdAt upcomingRelease assets { + __typename count sources { + __typename nodes { + __typename format url } } links { + __typename nodes { + __typename id name url @@ -26,13 +32,16 @@ fragment Release on Release { } } evidences { + __typename nodes { + __typename filepath collectedAt sha } } links { + __typename editUrl selfUrl openedIssuesUrl @@ -42,22 +51,27 @@ fragment Release on Release { closedMergeRequestsUrl } commit { + __typename sha webUrl title } author { + __typename webUrl avatarUrl username } milestones { + __typename nodes { + __typename id title description webPath stats { + __typename totalIssuesCount closedIssuesCount } diff --git a/app/assets/javascripts/releases/graphql/fragments/release_for_editing.fragment.graphql b/app/assets/javascripts/releases/graphql/fragments/release_for_editing.fragment.graphql index 47c5afefd78..75a73acb9ae 100644 --- a/app/assets/javascripts/releases/graphql/fragments/release_for_editing.fragment.graphql +++ b/app/assets/javascripts/releases/graphql/fragments/release_for_editing.fragment.graphql @@ -9,6 +9,7 @@ fragment ReleaseForEditing on Release { name url linkType + directAssetPath } } } diff --git a/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql b/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql index 10e4d883e62..f2d89dbe682 100644 --- a/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql +++ b/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql @@ -1,5 +1,11 @@ #import "../fragments/release.fragment.graphql" +# This query is identical to +# `app/graphql/queries/releases/all_releases.query.graphql`. +# These two queries should be kept in sync. +# When the `releases_index_apollo_client` feature flag is +# removed, this query should be removed entirely. + query allReleases( $fullPath: ID! $first: Int @@ -9,11 +15,14 @@ query allReleases( $sort: ReleaseSort ) { project(fullPath: $fullPath) { + __typename releases(first: $first, last: $last, before: $before, after: $after, sort: $sort) { + __typename nodes { ...Release } pageInfo { + __typename startCursor hasPreviousPage hasNextPage diff --git a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js index 5955ec3352e..576f099248e 100644 --- a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js +++ b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js @@ -165,6 +165,7 @@ const createReleaseLink = async ({ state, link }) => { name: link.name, url: link.url, linkType: link.linkType.toUpperCase(), + directAssetPath: link.directAssetPath, }, }, }); |