diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-10 21:14:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-10 21:14:42 +0300 |
commit | ca5de528358c23e9cfcb0ff0f42c4106310c3811 (patch) | |
tree | 92a0375549df74e40c3f3799a5de7a91fcd1a3a7 /app/assets/javascripts/packages_and_registries | |
parent | ecc11e5d608ff4393fb6c44d02416569e7d2785d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/packages_and_registries')
-rw-r--r-- | app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue | 24 | ||||
-rw-r--r-- | app/assets/javascripts/packages_and_registries/dependency_proxy/constants.js | 6 |
2 files changed, 3 insertions, 27 deletions
diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue index 52c63a1355a..eb112238c11 100644 --- a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue +++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue @@ -4,7 +4,6 @@ import { GlEmptyState, GlFormGroup, GlFormInputGroup, - GlLink, GlSkeletonLoader, GlSprintf, } from '@gitlab/ui'; @@ -16,10 +15,7 @@ import { DEPENDENCY_PROXY_SETTINGS_DESCRIPTION, DEPENDENCY_PROXY_DOCS_PATH, } from '~/packages_and_registries/settings/group/constants'; -import { - GRAPHQL_PAGE_SIZE, - ENABLE_DEPENDENCY_PROXY_DOCS_PATH, -} from '~/packages_and_registries/dependency_proxy/constants'; +import { GRAPHQL_PAGE_SIZE } from '~/packages_and_registries/dependency_proxy/constants'; import getDependencyProxyDetailsQuery from '~/packages_and_registries/dependency_proxy/graphql/queries/get_dependency_proxy_details.query.graphql'; @@ -29,7 +25,6 @@ export default { GlEmptyState, GlFormGroup, GlFormInputGroup, - GlLink, GlSkeletonLoader, GlSprintf, ClipboardButton, @@ -41,9 +36,6 @@ export default { proxyNotAvailableText: s__( 'DependencyProxy|Dependency Proxy feature is limited to public groups for now.', ), - proxyDisabledText: s__( - 'DependencyProxy|The Dependency Proxy is disabled. %{docLinkStart}Learn how to enable it%{docLinkEnd}.', - ), proxyImagePrefix: s__('DependencyProxy|Dependency Proxy image prefix'), copyImagePrefixText: s__('DependencyProxy|Copy prefix'), blobCountAndSize: s__('DependencyProxy|Contains %{count} blobs of images (%{size})'), @@ -52,7 +44,6 @@ export default { }, links: { DEPENDENCY_PROXY_DOCS_PATH, - ENABLE_DEPENDENCY_PROXY_DOCS_PATH, }, data() { return { @@ -79,9 +70,7 @@ export default { }, ]; }, - dependencyProxyEnabled() { - return this.group?.dependencyProxySetting?.enabled; - }, + queryVariables() { return { fullPath: this.groupPath, first: GRAPHQL_PAGE_SIZE }; }, @@ -131,7 +120,7 @@ export default { <gl-skeleton-loader v-else-if="$apollo.queries.group.loading" /> - <div v-else-if="dependencyProxyEnabled" data-testid="main-area"> + <div v-else data-testid="main-area"> <gl-form-group :label="$options.i18n.proxyImagePrefix"> <gl-form-input-group readonly @@ -170,12 +159,5 @@ export default { :title="$options.i18n.noManifestTitle" /> </div> - <gl-alert v-else :dismissible="false" data-testid="proxy-disabled"> - <gl-sprintf :message="$options.i18n.proxyDisabledText"> - <template #docLink="{ content }"> - <gl-link :href="$options.links.ENABLE_DEPENDENCY_PROXY_DOCS_PATH">{{ content }}</gl-link> - </template> - </gl-sprintf> - </gl-alert> </div> </template> diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/constants.js b/app/assets/javascripts/packages_and_registries/dependency_proxy/constants.js index ab1e3adcb55..3c6ede6fdce 100644 --- a/app/assets/javascripts/packages_and_registries/dependency_proxy/constants.js +++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/constants.js @@ -1,7 +1 @@ -import { helpPagePath } from '~/helpers/help_page_helper'; - export const GRAPHQL_PAGE_SIZE = 20; -export const ENABLE_DEPENDENCY_PROXY_DOCS_PATH = helpPagePath( - 'user/packages/dependency_proxy/index', - { anchor: 'enable-or-disable-the-dependency-proxy-for-a-group' }, -); |