Merge branch...

Merge branch '297488-move-all-package-container-registry-settings-to-new-settings-page' into 'master'

Move registry settings under package_and_registries

See merge request gitlab-org/gitlab!59652

app/assets/javascripts/registry/settings/components/expiration_input.vue → app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue

 <script>
 import { GlFormGroup, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui';
-import { NAME_REGEX_LENGTH, TEXT_AREA_INVALID_FEEDBACK } from '../constants';
+import {
+  NAME_REGEX_LENGTH,
+  TEXT_AREA_INVALID_FEEDBACK,
+} from '~/packages_and_registries/settings/project/constants';
 
 export default {
   components: {

app/assets/javascripts/registry/settings/components/expiration_run_text.vue → app/assets/javascripts/packages_and_registries/settings/project/components/expiration_run_text.vue

 <script>
 import { GlFormGroup, GlFormInput } from '@gitlab/ui';
-import { NEXT_CLEANUP_LABEL, NOT_SCHEDULED_POLICY_TEXT } from '~/registry/settings/constants';
+import {
+  NEXT_CLEANUP_LABEL,
+  NOT_SCHEDULED_POLICY_TEXT,
+} from '~/packages_and_registries/settings/project/constants';
 
 export default {
   components: {

app/assets/javascripts/registry/settings/components/expiration_toggle.vue → app/assets/javascripts/packages_and_registries/settings/project/components/expiration_toggle.vue

 <script>
 import { GlFormGroup, GlToggle, GlSprintf } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import { ENABLED_TOGGLE_DESCRIPTION, DISABLED_TOGGLE_DESCRIPTION } from '../constants';
+import {
+  ENABLED_TOGGLE_DESCRIPTION,
+  DISABLED_TOGGLE_DESCRIPTION,
+} from '~/packages_and_registries/settings/project/constants';
 
 export default {
   i18n: {

app/assets/javascripts/registry/settings/components/registry_settings_app.vue → app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue

@@ -7,8 +7,8 @@ import {
   UNAVAILABLE_FEATURE_INTRO_TEXT,
   UNAVAILABLE_USER_FEATURE_TEXT,
   UNAVAILABLE_ADMIN_FEATURE_TEXT,
-} from '../constants';
-import expirationPolicyQuery from '../graphql/queries/get_expiration_policy.query.graphql';
+} from '~/packages_and_registries/settings/project/constants';
+import expirationPolicyQuery from '~/packages_and_registries/settings/project/graphql/queries/get_expiration_policy.query.graphql';
 
 import SettingsForm from './settings_form.vue';
 

app/assets/javascripts/registry/settings/components/settings_form.vue → app/assets/javascripts/packages_and_registries/settings/project/components/settings_form.vue

@@ -17,10 +17,10 @@ import {
   NAME_REGEX_DESCRIPTION,
   CADENCE_LABEL,
   EXPIRATION_POLICY_FOOTER_NOTE,
-} from '~/registry/settings/constants';
-import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql';
-import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update';
-import { formOptionsGenerator } from '~/registry/settings/utils';
+} from '~/packages_and_registries/settings/project/constants';
+import updateContainerExpirationPolicyMutation from '~/packages_and_registries/settings/project/graphql/mutations/update_container_expiration_policy.mutation.graphql';
+import { updateContainerExpirationPolicy } from '~/packages_and_registries/settings/project/graphql/utils/cache_update';
+import { formOptionsGenerator } from '~/packages_and_registries/settings/project/utils';
 import Tracking from '~/tracking';
 import ExpirationDropdown from './expiration_dropdown.vue';
 import ExpirationInput from './expiration_input.vue';

app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js

@@ -3,9 +3,9 @@ import SecretValues from '~/behaviors/secret_values';
 import initSettingsPipelinesTriggers from '~/ci_settings_pipeline_triggers';
 import initVariableList from '~/ci_variable_list';
 import initDeployFreeze from '~/deploy_freeze';
+import registrySettingsApp from '~/packages_and_registries/settings/project/registry_settings_bundle';
 import { initInstallRunner } from '~/pages/shared/mount_runner_instructions';
 import initSharedRunnersToggle from '~/projects/settings/mount_shared_runners_toggle';
-import registrySettingsApp from '~/registry/settings/registry_settings_bundle';
 import initSettingsPanels from '~/settings_panels';
 
 document.addEventListener('DOMContentLoaded', () => {

spec/frontend/registry/settings/components/expiration_dropdown_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/expiration_dropdown_spec.js

 import { shallowMount } from '@vue/test-utils';
 import { GlFormGroup, GlFormSelect } from 'jest/registry/shared/stubs';
-import component from '~/registry/settings/components/expiration_dropdown.vue';
+import component from '~/packages_and_registries/settings/project/components/expiration_dropdown.vue';
 
 describe('ExpirationDropdown', () => {
   let wrapper;

spec/frontend/registry/settings/components/expiration_input_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/expiration_input_spec.js

 import { GlSprintf, GlFormInput, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import { GlFormGroup } from 'jest/registry/shared/stubs';
-import component from '~/registry/settings/components/expiration_input.vue';
-import { NAME_REGEX_LENGTH } from '~/registry/settings/constants';
+import component from '~/packages_and_registries/settings/project/components/expiration_input.vue';
+import { NAME_REGEX_LENGTH } from '~/packages_and_registries/settings/project/constants';
 
 describe('ExpirationInput', () => {
   let wrapper;

spec/frontend/registry/settings/components/expiration_run_text_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/expiration_run_text_spec.js

 import { GlFormInput } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import { GlFormGroup } from 'jest/registry/shared/stubs';
-import component from '~/registry/settings/components/expiration_run_text.vue';
-import { NEXT_CLEANUP_LABEL, NOT_SCHEDULED_POLICY_TEXT } from '~/registry/settings/constants';
+import component from '~/packages_and_registries/settings/project/components/expiration_run_text.vue';
+import {
+  NEXT_CLEANUP_LABEL,
+  NOT_SCHEDULED_POLICY_TEXT,
+} from '~/packages_and_registries/settings/project/constants';
 
 describe('ExpirationToggle', () => {
   let wrapper;

spec/frontend/registry/settings/components/expiration_toggle_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/expiration_toggle_spec.js

 import { GlToggle, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import { GlFormGroup } from 'jest/registry/shared/stubs';
-import component from '~/registry/settings/components/expiration_toggle.vue';
+import component from '~/packages_and_registries/settings/project/components/expiration_toggle.vue';
 import {
   ENABLED_TOGGLE_DESCRIPTION,
   DISABLED_TOGGLE_DESCRIPTION,
-} from '~/registry/settings/constants';
+} from '~/packages_and_registries/settings/project/constants';
 
 describe('ExpirationToggle', () => {
   let wrapper;

spec/frontend/registry/settings/components/registry_settings_app_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/registry_settings_app_spec.js

@@ -2,14 +2,14 @@ import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
-import component from '~/registry/settings/components/registry_settings_app.vue';
-import SettingsForm from '~/registry/settings/components/settings_form.vue';
+import component from '~/packages_and_registries/settings/project/components/registry_settings_app.vue';
+import SettingsForm from '~/packages_and_registries/settings/project/components/settings_form.vue';
 import {
   FETCH_SETTINGS_ERROR_MESSAGE,
   UNAVAILABLE_FEATURE_INTRO_TEXT,
   UNAVAILABLE_USER_FEATURE_TEXT,
-} from '~/registry/settings/constants';
-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
+} from '~/packages_and_registries/settings/project/constants';
+import expirationPolicyQuery from '~/packages_and_registries/settings/project/graphql/queries/get_expiration_policy.query.graphql';
 
 import {
   expirationPolicyPayload,

spec/frontend/registry/settings/components/settings_form_spec.js → spec/frontend/packages_and_registries/settings/project/settings/components/settings_form_spec.js

@@ -2,15 +2,15 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import component from '~/registry/settings/components/settings_form.vue';
+import { GlCard, GlLoadingIcon } from 'jest/registry/shared/stubs';
+import component from '~/packages_and_registries/settings/project/components/settings_form.vue';
 import {
   UPDATE_SETTINGS_ERROR_MESSAGE,
   UPDATE_SETTINGS_SUCCESS_MESSAGE,
-} from '~/registry/settings/constants';
-import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql';
-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
+} from '~/packages_and_registries/settings/project/constants';
+import updateContainerExpirationPolicyMutation from '~/packages_and_registries/settings/project/graphql/mutations/update_container_expiration_policy.mutation.graphql';
+import expirationPolicyQuery from '~/packages_and_registries/settings/project/graphql/queries/get_expiration_policy.query.graphql';
 import Tracking from '~/tracking';
-import { GlCard, GlLoadingIcon } from '../../shared/stubs';
 import { expirationPolicyPayload, expirationPolicyMutationPayload } from '../mock_data';
 
 const localVue = createLocalVue();

spec/frontend/registry/settings/graphql/cache_updated_spec.js → spec/frontend/packages_and_registries/settings/project/settings/graphql/cache_updated_spec.js

-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
-import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update';
+import expirationPolicyQuery from '~/packages_and_registries/settings/project/graphql/queries/get_expiration_policy.query.graphql';
+import { updateContainerExpirationPolicy } from '~/packages_and_registries/settings/project/graphql/utils/cache_update';
 
 describe('Registry settings cache update', () => {
   let client;

spec/frontend/registry/settings/utils_spec.js → spec/frontend/packages_and_registries/settings/project/settings/utils_spec.js

@@ -2,7 +2,7 @@ import {
   formOptionsGenerator,
   optionLabelGenerator,
   olderThanTranslationGenerator,
-} from '~/registry/settings/utils';
+} from '~/packages_and_registries/settings/project/utils';
 
 describe('Utils', () => {
   describe('optionLabelGenerator', () => {