Commit 84aef766 authored by Reuben Pereira's avatar Reuben Pereira

Move the container registry visibility setting

Currently, the Container Registry visibility setting is nested within
the Repository visibility setting. But on the backend, Container
Registry visibility is not affected by Repository visibility.

This commit moves the Container Registry visibility setting so that
it is not nested within the Repository setting, and the input element
is not affected by the Repository setting.
parent 858320c2
...@@ -523,36 +523,6 @@ export default { ...@@ -523,36 +523,6 @@ export default {
name="project[project_feature_attributes][forking_access_level]" name="project[project_feature_attributes][forking_access_level]"
/> />
</project-setting-row> </project-setting-row>
<project-setting-row
v-if="registryAvailable"
ref="container-registry-settings"
:help-path="registryHelpPath"
:label="$options.i18n.containerRegistryLabel"
:help-text="
s__('ProjectSettings|Every project can have its own space to store its Docker images')
"
>
<div v-if="showContainerRegistryPublicNote" class="text-muted">
<gl-sprintf
:message="
s__(
`ProjectSettings|Note: The container registry is always visible when a project is public and the container registry is set to '%{access_level_description}'`,
)
"
>
<template #access_level_description>{{
featureAccessLevelDescriptions[featureAccessLevel.EVERYONE]
}}</template>
</gl-sprintf>
</div>
<project-feature-setting
v-model="containerRegistryAccessLevel"
:options="repoFeatureAccessLevelOptions"
:disabled-input="!repositoryEnabled"
:label="$options.i18n.containerRegistryLabel"
name="project[project_feature_attributes][container_registry_access_level]"
/>
</project-setting-row>
<project-setting-row <project-setting-row
v-if="lfsAvailable" v-if="lfsAvailable"
ref="git-lfs-settings" ref="git-lfs-settings"
...@@ -606,18 +576,47 @@ export default { ...@@ -606,18 +576,47 @@ export default {
name="project[packages_enabled]" name="project[packages_enabled]"
/> />
</project-setting-row> </project-setting-row>
<project-setting-row
ref="pipeline-settings"
:label="$options.i18n.ciCdLabel"
:help-text="s__('ProjectSettings|Build, test, and deploy your changes.')"
>
<project-feature-setting
v-model="buildsAccessLevel"
:label="$options.i18n.ciCdLabel"
:options="repoFeatureAccessLevelOptions"
:disabled-input="!repositoryEnabled"
name="project[project_feature_attributes][builds_access_level]"
/>
</project-setting-row>
</div> </div>
<project-setting-row <project-setting-row
ref="pipeline-settings" v-if="registryAvailable"
:label="$options.i18n.ciCdLabel" ref="container-registry-settings"
:help-text="s__('ProjectSettings|Build, test, and deploy your changes.')" :help-path="registryHelpPath"
:label="$options.i18n.containerRegistryLabel"
:help-text="
s__('ProjectSettings|Every project can have its own space to store its Docker images')
"
> >
<div v-if="showContainerRegistryPublicNote" class="text-muted">
<gl-sprintf
:message="
s__(
`ProjectSettings|Note: The container registry is always visible when a project is public and the container registry is set to '%{access_level_description}'`,
)
"
>
<template #access_level_description>{{
featureAccessLevelDescriptions[featureAccessLevel.EVERYONE]
}}</template>
</gl-sprintf>
</div>
<project-feature-setting <project-feature-setting
v-model="buildsAccessLevel" v-model="containerRegistryAccessLevel"
:label="$options.i18n.ciCdLabel" :options="featureAccessLevelOptions"
:options="repoFeatureAccessLevelOptions" :label="$options.i18n.containerRegistryLabel"
:disabled-input="!repositoryEnabled" name="project[project_feature_attributes][container_registry_access_level]"
name="project[project_feature_attributes][builds_access_level]"
/> />
</project-setting-row> </project-setting-row>
<project-setting-row <project-setting-row
......
...@@ -311,24 +311,6 @@ describe('Settings Panel', () => { ...@@ -311,24 +311,6 @@ describe('Settings Panel', () => {
expect(findContainerRegistryPublicNoteGlSprintfComponent().exists()).toBe(false); expect(findContainerRegistryPublicNoteGlSprintfComponent().exists()).toBe(false);
}); });
it('should enable the container registry input when the repository is enabled', () => {
wrapper = mountComponent({
currentSettings: { repositoryAccessLevel: featureAccessLevel.EVERYONE },
registryAvailable: true,
});
expect(findContainerRegistryAccessLevelInput().props('disabledInput')).toBe(false);
});
it('should disable the container registry input when the repository is disabled', () => {
wrapper = mountComponent({
currentSettings: { repositoryAccessLevel: featureAccessLevel.NOT_ENABLED },
registryAvailable: true,
});
expect(findContainerRegistryAccessLevelInput().props('disabledInput')).toBe(true);
});
it('has label for the toggle', () => { it('has label for the toggle', () => {
wrapper = mountComponent({ wrapper = mountComponent({
currentSettings: { visibilityLevel: visibilityOptions.PUBLIC }, currentSettings: { visibilityLevel: visibilityOptions.PUBLIC },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment