From f01eeea4149102471ed59d939e57c74c2b4aecbf Mon Sep 17 00:00:00 2001
From: Julie Huang <julhuang@gitlab.com>
Date: Thu, 20 Feb 2025 11:10:45 +1100
Subject: [PATCH] Nest /feature_settings folder under duo_self_hosted root
 directory

/feature_settings contains child components which are part of the duo_self_hosted feature and should be nested under this root folder
---
 .../javascripts/pages/admin/ai/duo_self_hosted/app.vue      | 2 +-
 .../components/feature_settings_model_selector.vue          | 6 +++---
 .../feature_settings/components/feature_settings_table.vue  | 0
 .../mutations/update_ai_feature_setting.mutation.graphql    | 0
 .../graphql/queries/get_ai_feature_settings.query.graphql   | 0
 .../feature_settings_model_selector_spec.js                 | 6 +++---
 .../feature_settings/feature_settings_table_spec.js         | 4 ++--
 .../ai/{ => duo_self_hosted}/feature_settings/mock_data.js  | 0
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename ee/app/assets/javascripts/pages/admin/ai/{ => duo_self_hosted}/feature_settings/components/feature_settings_model_selector.vue (94%)
 rename ee/app/assets/javascripts/pages/admin/ai/{ => duo_self_hosted}/feature_settings/components/feature_settings_table.vue (100%)
 rename ee/app/assets/javascripts/pages/admin/ai/{ => duo_self_hosted}/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql (100%)
 rename ee/app/assets/javascripts/pages/admin/ai/{ => duo_self_hosted}/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql (100%)
 rename ee/spec/frontend/pages/admin/ai/{ => duo_self_hosted}/feature_settings/feature_settings_model_selector_spec.js (93%)
 rename ee/spec/frontend/pages/admin/ai/{ => duo_self_hosted}/feature_settings/feature_settings_table_spec.js (93%)
 rename ee/spec/frontend/pages/admin/ai/{ => duo_self_hosted}/feature_settings/mock_data.js (100%)

diff --git a/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/app.vue b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/app.vue
index 29fc571292a47..238537334abdc 100644
--- a/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/app.vue
+++ b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/app.vue
@@ -3,7 +3,7 @@ import { GlTabs, GlTab, GlButton } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import PageHeading from '~/vue_shared/components/page_heading.vue';
 import SelfHostedModelsTable from '../self_hosted_models/components/self_hosted_models_table.vue';
-import FeatureSettingsTable from '../feature_settings/components/feature_settings_table.vue';
+import FeatureSettingsTable from './feature_settings/components/feature_settings_table.vue';
 import { SELF_HOSTED_DUO_TABS } from './constants';
 
 export default {
diff --git a/ee/app/assets/javascripts/pages/admin/ai/feature_settings/components/feature_settings_model_selector.vue b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_model_selector.vue
similarity index 94%
rename from ee/app/assets/javascripts/pages/admin/ai/feature_settings/components/feature_settings_model_selector.vue
rename to ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_model_selector.vue
index f4afca4abe5cf..06070d9ce91d7 100644
--- a/ee/app/assets/javascripts/pages/admin/ai/feature_settings/components/feature_settings_model_selector.vue
+++ b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_model_selector.vue
@@ -1,11 +1,11 @@
 <script>
 import { s__, sprintf } from '~/locale';
 import { createAlert } from '~/alert';
-import { RELEASE_STATES } from '../../self_hosted_models/constants';
+import { RELEASE_STATES } from '../../../self_hosted_models/constants';
 import updateAiFeatureSetting from '../graphql/mutations/update_ai_feature_setting.mutation.graphql';
 import getAiFeatureSettingsQuery from '../graphql/queries/get_ai_feature_settings.query.graphql';
-import getSelfHostedModelsQuery from '../../self_hosted_models/graphql/queries/get_self_hosted_models.query.graphql';
-import ModelSelectDropdown from '../../duo_self_hosted/shared/model_select_dropdown.vue';
+import getSelfHostedModelsQuery from '../../../self_hosted_models/graphql/queries/get_self_hosted_models.query.graphql';
+import ModelSelectDropdown from '../../shared/model_select_dropdown.vue';
 
 const PROVIDERS = {
   DISABLED: 'disabled',
diff --git a/ee/app/assets/javascripts/pages/admin/ai/feature_settings/components/feature_settings_table.vue b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_table.vue
similarity index 100%
rename from ee/app/assets/javascripts/pages/admin/ai/feature_settings/components/feature_settings_table.vue
rename to ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_table.vue
diff --git a/ee/app/assets/javascripts/pages/admin/ai/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/pages/admin/ai/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql
rename to ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql
diff --git a/ee/app/assets/javascripts/pages/admin/ai/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql b/ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/pages/admin/ai/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql
rename to ee/app/assets/javascripts/pages/admin/ai/duo_self_hosted/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql
diff --git a/ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_model_selector_spec.js b/ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_model_selector_spec.js
similarity index 93%
rename from ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_model_selector_spec.js
rename to ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_model_selector_spec.js
index 0837318e673ed..465d57172d111 100644
--- a/ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_model_selector_spec.js
+++ b/ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_model_selector_spec.js
@@ -4,10 +4,10 @@ import { GlToast } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import waitForPromises from 'helpers/wait_for_promises';
 import createMockApollo from 'helpers/mock_apollo_helper';
-import FeatureSettingsModelSelector from 'ee/pages/admin/ai/feature_settings/components/feature_settings_model_selector.vue';
+import FeatureSettingsModelSelector from 'ee/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_model_selector.vue';
 import ModelSelectDropdown from 'ee/pages/admin/ai/duo_self_hosted/shared/model_select_dropdown.vue';
-import updateAiFeatureSetting from 'ee/pages/admin/ai/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql';
-import getAiFeatureSettingsQuery from 'ee/pages/admin/ai/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql';
+import updateAiFeatureSetting from 'ee/pages/admin/ai/duo_self_hosted/feature_settings/graphql/mutations/update_ai_feature_setting.mutation.graphql';
+import getAiFeatureSettingsQuery from 'ee/pages/admin/ai/duo_self_hosted/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql';
 import getSelfHostedModelsQuery from 'ee/pages/admin/ai/self_hosted_models/graphql/queries/get_self_hosted_models.query.graphql';
 import { createAlert } from '~/alert';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
diff --git a/ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_table_spec.js b/ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_table_spec.js
similarity index 93%
rename from ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_table_spec.js
rename to ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_table_spec.js
index ae8dc3ff8caef..a3020f6546619 100644
--- a/ee/spec/frontend/pages/admin/ai/feature_settings/feature_settings_table_spec.js
+++ b/ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/feature_settings_table_spec.js
@@ -3,8 +3,8 @@ import VueApollo from 'vue-apollo';
 import { GlTableLite, GlSkeletonLoader } from '@gitlab/ui';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import createMockApollo from 'helpers/mock_apollo_helper';
-import FeatureSettingsTable from 'ee/pages/admin/ai/feature_settings/components/feature_settings_table.vue';
-import getAiFeatureSettingsQuery from 'ee/pages/admin/ai/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql';
+import FeatureSettingsTable from 'ee/pages/admin/ai/duo_self_hosted/feature_settings/components/feature_settings_table.vue';
+import getAiFeatureSettingsQuery from 'ee/pages/admin/ai/duo_self_hosted/feature_settings/graphql/queries/get_ai_feature_settings.query.graphql';
 import { createAlert } from '~/alert';
 import waitForPromises from 'helpers/wait_for_promises';
 import { mockAiFeatureSettings } from './mock_data';
diff --git a/ee/spec/frontend/pages/admin/ai/feature_settings/mock_data.js b/ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/mock_data.js
similarity index 100%
rename from ee/spec/frontend/pages/admin/ai/feature_settings/mock_data.js
rename to ee/spec/frontend/pages/admin/ai/duo_self_hosted/feature_settings/mock_data.js
-- 
GitLab