Merge branch '327645-geo-nodes-namespace' into 'master'

Geo Nodes - Takeover geo_nodes namespace

See merge request gitlab-org/gitlab!63788

ee/app/assets/javascripts/geo_nodes_beta/components/app.vue → ee/app/assets/javascripts/geo_nodes/components/app.vue

@@ -7,7 +7,7 @@ import GeoNodes from './geo_nodes.vue';
 import GeoNodesEmptyState from './geo_nodes_empty_state.vue';
 
 export default {
-  name: 'GeoNodesBetaApp',
+  name: 'GeoNodesApp',
   i18n: {
     geoSites: s__('Geo|Geo sites'),
     helpText: s__(

ee/app/assets/javascripts/geo_nodes_beta/components/details/primary_node/geo_node_verification_info.vue → ee/app/assets/javascripts/geo_nodes/components/details/primary_node/geo_node_verification_info.vue

 <script>
 import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui';
 import { mapGetters } from 'vuex';
-import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants';
+import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
 import { s__, __ } from '~/locale';
 import GeoNodeProgressBar from '../geo_node_progress_bar.vue';
 

ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue → ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_counts.vue

 <script>
 import { mapGetters } from 'vuex';
-import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants';
+import { REPOSITORY, BLOB } from 'ee/geo_nodes/constants';
 import { __, s__ } from '~/locale';
 import GeoNodeReplicationSyncPercentage from './geo_node_replication_sync_percentage.vue';
 

ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details.vue → ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_details.vue

 <script>
 import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui';
 import { mapGetters, mapState } from 'vuex';
-import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes_beta/constants';
+import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes/constants';
 import { s__, __ } from '~/locale';
 import GeoNodeReplicationDetailsResponsive from './geo_node_replication_details_responsive.vue';
 import GeoNodeReplicationStatusMobile from './geo_node_replication_status_mobile.vue';

ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_responsive.vue → ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_details_responsive.vue

 <script>
 import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
 import { s__, __ } from '~/locale';
 
 export default {

ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status.vue → ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_status.vue

 <script>
 import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
-import { REPLICATION_STATUS_UI, REPLICATION_PAUSE_URL } from 'ee/geo_nodes_beta/constants';
+import { REPLICATION_STATUS_UI, REPLICATION_PAUSE_URL } from 'ee/geo_nodes/constants';
 import { __, s__ } from '~/locale';
 
 export default {

ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_mobile.vue → ee/app/assets/javascripts/geo_nodes/components/details/secondary_node/geo_node_replication_status_mobile.vue

 <script>
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
 
 export default {
   name: 'GeoNodeReplicationStatusMobile',

ee/app/assets/javascripts/geo_nodes_beta/components/header/geo_node_actions.vue → ee/app/assets/javascripts/geo_nodes/components/header/geo_node_actions.vue

 <script>
 import { mapActions } from 'vuex';
-import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes_beta/constants';
+import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes/constants';
 import { BV_SHOW_MODAL } from '~/lib/utils/constants';
 import GeoNodeActionsDesktop from './geo_node_actions_desktop.vue';
 import GeoNodeActionsMobile from './geo_node_actions_mobile.vue';

ee/app/assets/javascripts/geo_nodes_beta/components/header/geo_node_health_status.vue → ee/app/assets/javascripts/geo_nodes/components/header/geo_node_health_status.vue

 <script>
 import { GlIcon, GlBadge } from '@gitlab/ui';
-import { HEALTH_STATUS_UI } from 'ee/geo_nodes_beta/constants';
+import { HEALTH_STATUS_UI } from 'ee/geo_nodes/constants';
 
 export default {
   components: {

ee/app/assets/javascripts/geo_nodes_beta/components/header/geo_node_last_updated.vue → ee/app/assets/javascripts/geo_nodes/components/header/geo_node_last_updated.vue

@@ -4,7 +4,7 @@ import {
   HELP_NODE_HEALTH_URL,
   GEO_TROUBLESHOOTING_URL,
   STATUS_DELAY_THRESHOLD_MS,
-} from 'ee/geo_nodes_beta/constants';
+} from 'ee/geo_nodes/constants';
 import { s__ } from '~/locale';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 

ee/app/assets/javascripts/geo_nodes_beta/index.js → ee/app/assets/javascripts/geo_nodes/index.js

 import Vue from 'vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import Translate from '~/vue_shared/translate';
-import GeoNodesBetaApp from './components/app.vue';
+import GeoNodesApp from './components/app.vue';
 import createStore from './store';
 
 Vue.use(Translate);
 
-export const initGeoNodesBeta = () => {
-  const el = document.getElementById('js-geo-nodes-beta');
+export const initGeoNodes = () => {
+  const el = document.getElementById('js-geo-nodes');
 
   if (!el) {
     return false;
@@ -22,7 +22,7 @@ export const initGeoNodesBeta = () => {
     el,
     store: createStore({ primaryVersion, primaryRevision, replicableTypes }),
     render(createElement) {
-      return createElement(GeoNodesBetaApp, {
+      return createElement(GeoNodesApp, {
         props: {
           newNodeUrl,
           geoNodesEmptyStateSvg,

ee/app/assets/javascripts/pages/admin/geo/nodes/index.js

-import { initGeoNodesBeta } from 'ee/geo_nodes_beta';
+import { initGeoNodes } from 'ee/geo_nodes';
 
-initGeoNodesBeta();
+initGeoNodes();

ee/app/views/admin/geo/nodes/index.html.haml

@@ -4,4 +4,4 @@
 = render_migrate_hashed_storage_warning
 = render partial: 'admin/geo/shared/license_alert'
 
-#js-geo-nodes-beta{ data: node_vue_list_properties }
+#js-geo-nodes{ data: node_vue_list_properties }

ee/spec/frontend/geo_nodes_beta/components/app_spec.js → ee/spec/frontend/geo_nodes/components/app_spec.js

@@ -2,16 +2,16 @@ import { GlLink, GlButton, GlLoadingIcon, GlModal, GlSprintf } from '@gitlab/ui'
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodesBetaApp from 'ee/geo_nodes_beta/components/app.vue';
-import GeoNodes from 'ee/geo_nodes_beta/components/geo_nodes.vue';
-import GeoNodesEmptyState from 'ee/geo_nodes_beta/components/geo_nodes_empty_state.vue';
-import { GEO_INFO_URL } from 'ee/geo_nodes_beta/constants';
+import GeoNodesApp from 'ee/geo_nodes/components/app.vue';
+import GeoNodes from 'ee/geo_nodes/components/geo_nodes.vue';
+import GeoNodesEmptyState from 'ee/geo_nodes/components/geo_nodes_empty_state.vue';
+import { GEO_INFO_URL } from 'ee/geo_nodes/constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import { MOCK_NODES, MOCK_NEW_NODE_URL, MOCK_EMPTY_STATE_SVG } from '../mock_data';
 
 Vue.use(Vuex);
 
-describe('GeoNodesBetaApp', () => {
+describe('GeoNodesApp', () => {
   let wrapper;
 
   const actionSpies = {
@@ -34,7 +34,7 @@ describe('GeoNodesBetaApp', () => {
     });
 
     wrapper = extendedWrapper(
-      shallowMount(GeoNodesBetaApp, {
+      shallowMount(GeoNodesApp, {
         store,
         propsData: {
           ...defaultProps,
@@ -49,7 +49,7 @@ describe('GeoNodesBetaApp', () => {
     wrapper.destroy();
   });
 
-  const findGeoNodesBetaContainer = () => wrapper.find('section');
+  const findGeoNodesAppContainer = () => wrapper.find('section');
   const findGeoLearnMoreLink = () => wrapper.findComponent(GlLink);
   const findGeoAddSiteButton = () => wrapper.findComponent(GlButton);
   const findGlLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
@@ -65,8 +65,8 @@ describe('GeoNodesBetaApp', () => {
         createComponent();
       });
 
-      it('renders the Geo Nodes Beta Container', () => {
-        expect(findGeoNodesBetaContainer().exists()).toBe(true);
+      it('renders the Geo Nodes App Container', () => {
+        expect(findGeoNodesAppContainer().exists()).toBe(true);
       });
 
       it('renders the Learn more link correctly', () => {

ee/spec/frontend/geo_nodes_beta/components/details/geo_node_core_details_spec.js → ee/spec/frontend/geo_nodes/components/details/geo_node_core_details_spec.js

@@ -2,12 +2,12 @@ import { GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodeCoreDetails from 'ee/geo_nodes_beta/components/details/geo_node_core_details.vue';
+import GeoNodeCoreDetails from 'ee/geo_nodes/components/details/geo_node_core_details.vue';
 import {
   MOCK_PRIMARY_VERSION,
   MOCK_REPLICABLE_TYPES,
   MOCK_NODES,
-} from 'ee_jest/geo_nodes_beta/mock_data';
+} from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 Vue.use(Vuex);

ee/spec/frontend/geo_nodes_beta/components/details/geo_node_details_spec.js → ee/spec/frontend/geo_nodes/components/details/geo_node_details_spec.js

 import { shallowMount } from '@vue/test-utils';
-import GeoNodeCoreDetails from 'ee/geo_nodes_beta/components/details/geo_node_core_details.vue';
-import GeoNodeDetails from 'ee/geo_nodes_beta/components/details/geo_node_details.vue';
-import GeoNodePrimaryOtherInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_primary_other_info.vue';
-import GeoNodeVerificationInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_verification_info.vue';
-import GeoNodeReplicationDetails from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details.vue';
-import GeoNodeReplicationSummary from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_summary.vue';
-import GeoNodeSecondaryOtherInfo from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_secondary_other_info.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeCoreDetails from 'ee/geo_nodes/components/details/geo_node_core_details.vue';
+import GeoNodeDetails from 'ee/geo_nodes/components/details/geo_node_details.vue';
+import GeoNodePrimaryOtherInfo from 'ee/geo_nodes/components/details/primary_node/geo_node_primary_other_info.vue';
+import GeoNodeVerificationInfo from 'ee/geo_nodes/components/details/primary_node/geo_node_verification_info.vue';
+import GeoNodeReplicationDetails from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_details.vue';
+import GeoNodeReplicationSummary from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_summary.vue';
+import GeoNodeSecondaryOtherInfo from 'ee/geo_nodes/components/details/secondary_node/geo_node_secondary_other_info.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeDetails', () => {

ee/spec/frontend/geo_nodes_beta/components/details/geo_node_progress_bar_spec.js → ee/spec/frontend/geo_nodes/components/details/geo_node_progress_bar_spec.js

 import { GlPopover } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import { MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import { MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes/mock_data';
 import StackedProgressBar from '~/vue_shared/components/stacked_progress_bar.vue';
 
 describe('GeoNodeProgressBar', () => {

ee/spec/frontend/geo_nodes_beta/components/details/primary_node/geo_node_primary_other_info_spec.js → ee/spec/frontend/geo_nodes/components/details/primary_node/geo_node_primary_other_info_spec.js

 import { GlCard } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import GeoNodePrimaryOtherInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_primary_other_info.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import GeoNodePrimaryOtherInfo from 'ee/geo_nodes/components/details/primary_node/geo_node_primary_other_info.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 

ee/spec/frontend/geo_nodes_beta/components/details/primary_node/geo_node_verification_info_spec.js → ee/spec/frontend/geo_nodes/components/details/primary_node/geo_node_verification_info_spec.js

@@ -2,10 +2,10 @@ import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import GeoNodeVerificationInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_verification_info.vue';
-import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants';
-import { MOCK_NODES, MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import GeoNodeVerificationInfo from 'ee/geo_nodes/components/details/primary_node/geo_node_verification_info.vue';
+import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
+import { MOCK_NODES, MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 Vue.use(Vuex);

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_counts_spec.js

 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue';
-import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
-import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants';
+import GeoNodeReplicationCounts from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_counts.vue';
+import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
+import { REPOSITORY, BLOB } from 'ee/geo_nodes/constants';
 import {
   MOCK_NODES,
   MOCK_SECONDARY_SYNC_INFO,
   MOCK_PRIMARY_VERIFICATION_INFO,
-} from 'ee_jest/geo_nodes_beta/mock_data';
+} from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 Vue.use(Vuex);

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_responsive_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_details_responsive_spec.js

 import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_responsive.vue';
-import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_details_responsive.vue';
+import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeReplicationDetailsResponsive', () => {

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_details_spec.js

@@ -2,11 +2,11 @@ import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodeReplicationDetails from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details.vue';
-import GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_responsive.vue';
-import GeoNodeReplicationStatusMobile from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_mobile.vue';
-import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes_beta/constants';
-import { MOCK_NODES, MOCK_REPLICABLE_TYPES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeReplicationDetails from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_details.vue';
+import GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_details_responsive.vue';
+import GeoNodeReplicationStatusMobile from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_status_mobile.vue';
+import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes/constants';
+import { MOCK_NODES, MOCK_REPLICABLE_TYPES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 Vue.use(Vuex);

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_mobile_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_status_mobile_spec.js

 import { shallowMount } from '@vue/test-utils';
-import GeoNodeProgressBar from 'ee/geo_nodes_beta/components/details/geo_node_progress_bar.vue';
-import GeoNodeReplicationStatusMobile from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_mobile.vue';
+import GeoNodeProgressBar from 'ee/geo_nodes/components/details/geo_node_progress_bar.vue';
+import GeoNodeReplicationStatusMobile from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_status_mobile.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeReplicationStatusMobile', () => {

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_status_spec.js

 import { GlPopover, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeReplicationStatus from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status.vue';
-import { REPLICATION_STATUS_UI, REPLICATION_PAUSE_URL } from 'ee/geo_nodes_beta/constants';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeReplicationStatus from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_status.vue';
+import { REPLICATION_STATUS_UI, REPLICATION_PAUSE_URL } from 'ee/geo_nodes/constants';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeReplicationStatus', () => {

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_summary_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_summary_spec.js

 import { GlButton, GlCard } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue';
-import GeoNodeReplicationStatus from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status.vue';
-import GeoNodeReplicationSummary from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_summary.vue';
-import GeoNodeSyncSettings from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_sync_settings.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeReplicationCounts from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_counts.vue';
+import GeoNodeReplicationStatus from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_status.vue';
+import GeoNodeReplicationSummary from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_summary.vue';
+import GeoNodeSyncSettings from 'ee/geo_nodes/components/details/secondary_node/geo_node_sync_settings.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 
 describe('GeoNodeReplicationSummary', () => {
   let wrapper;

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_replication_sync_percentage_spec.js

 import { shallowMount } from '@vue/test-utils';
-import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
+import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
 
 describe('GeoNodeReplicationSyncPercentage', () => {
   let wrapper;

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_secondary_other_info_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_secondary_other_info_spec.js

 import { GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeSecondaryOtherInfo from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_secondary_other_info.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeSecondaryOtherInfo from 'ee/geo_nodes/components/details/secondary_node/geo_node_secondary_other_info.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 

ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_sync_settings_spec.js → ee/spec/frontend/geo_nodes/components/details/secondary_node/geo_node_sync_settings_spec.js

 import { shallowMount } from '@vue/test-utils';
-import GeoNodeSyncSettings from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_sync_settings.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeSyncSettings from 'ee/geo_nodes/components/details/secondary_node/geo_node_sync_settings.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeSyncSettings', () => {

ee/spec/frontend/geo_nodes_beta/components/geo_nodes_empty_state_spec.js → ee/spec/frontend/geo_nodes/components/geo_nodes_empty_state_spec.js

 import { GlEmptyState } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodesEmptyState from 'ee/geo_nodes_beta/components/geo_nodes_empty_state.vue';
-import { GEO_FEATURE_URL } from 'ee/geo_nodes_beta/constants';
+import GeoNodesEmptyState from 'ee/geo_nodes/components/geo_nodes_empty_state.vue';
+import { GEO_FEATURE_URL } from 'ee/geo_nodes/constants';
 import { MOCK_EMPTY_STATE_SVG } from '../mock_data';
 
 describe('GeoNodesEmptyState', () => {

ee/spec/frontend/geo_nodes_beta/components/geo_nodes_spec.js → ee/spec/frontend/geo_nodes/components/geo_nodes_spec.js

 import { shallowMount } from '@vue/test-utils';
-import GeoNodeDetails from 'ee/geo_nodes_beta/components/details/geo_node_details.vue';
-import GeoNodes from 'ee/geo_nodes_beta/components/geo_nodes.vue';
-import GeoNodeHeader from 'ee/geo_nodes_beta/components/header/geo_node_header.vue';
+import GeoNodeDetails from 'ee/geo_nodes/components/details/geo_node_details.vue';
+import GeoNodes from 'ee/geo_nodes/components/geo_nodes.vue';
+import GeoNodeHeader from 'ee/geo_nodes/components/header/geo_node_header.vue';
 import { MOCK_NODES } from '../mock_data';
 
 describe('GeoNodes', () => {

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_actions_desktop_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_actions_desktop_spec.js

 import { GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeActionsDesktop from 'ee/geo_nodes_beta/components/header/geo_node_actions_desktop.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeActionsDesktop from 'ee/geo_nodes/components/header/geo_node_actions_desktop.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeActionsDesktop', () => {

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_actions_mobile_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_actions_mobile_spec.js

 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeActionsMobile from 'ee/geo_nodes_beta/components/header/geo_node_actions_mobile.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeActionsMobile from 'ee/geo_nodes/components/header/geo_node_actions_mobile.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('GeoNodeActionsMobile', () => {

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_actions_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_actions_spec.js

 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import GeoNodeActions from 'ee/geo_nodes_beta/components/header/geo_node_actions.vue';
-import GeoNodeActionsDesktop from 'ee/geo_nodes_beta/components/header/geo_node_actions_desktop.vue';
-import GeoNodeActionsMobile from 'ee/geo_nodes_beta/components/header/geo_node_actions_mobile.vue';
-import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes_beta/constants';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeActions from 'ee/geo_nodes/components/header/geo_node_actions.vue';
+import GeoNodeActionsDesktop from 'ee/geo_nodes/components/header/geo_node_actions_desktop.vue';
+import GeoNodeActionsMobile from 'ee/geo_nodes/components/header/geo_node_actions_mobile.vue';
+import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes/constants';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 import waitForPromises from 'helpers/wait_for_promises';
 import { BV_SHOW_MODAL } from '~/lib/utils/constants';
 

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_header_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_header_spec.js

 import { GlButton, GlBadge } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeActions from 'ee/geo_nodes_beta/components/header/geo_node_actions.vue';
-import GeoNodeHeader from 'ee/geo_nodes_beta/components/header/geo_node_header.vue';
-import GeoNodeHealthStatus from 'ee/geo_nodes_beta/components/header/geo_node_health_status.vue';
-import GeoNodeLastUpdated from 'ee/geo_nodes_beta/components/header/geo_node_last_updated.vue';
-import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data';
+import GeoNodeActions from 'ee/geo_nodes/components/header/geo_node_actions.vue';
+import GeoNodeHeader from 'ee/geo_nodes/components/header/geo_node_header.vue';
+import GeoNodeHealthStatus from 'ee/geo_nodes/components/header/geo_node_health_status.vue';
+import GeoNodeLastUpdated from 'ee/geo_nodes/components/header/geo_node_last_updated.vue';
+import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
 
 describe('GeoNodeHeader', () => {
   let wrapper;

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_health_status_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_health_status_spec.js

 import { GlIcon, GlBadge } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeHealthStatus from 'ee/geo_nodes_beta/components/header/geo_node_health_status.vue';
-import { HEALTH_STATUS_UI } from 'ee/geo_nodes_beta/constants';
+import GeoNodeHealthStatus from 'ee/geo_nodes/components/header/geo_node_health_status.vue';
+import { HEALTH_STATUS_UI } from 'ee/geo_nodes/constants';
 
 describe('GeoNodeHealthStatus', () => {
   let wrapper;

ee/spec/frontend/geo_nodes_beta/components/header/geo_node_last_updated_spec.js → ee/spec/frontend/geo_nodes/components/header/geo_node_last_updated_spec.js

 import { GlPopover, GlLink, GlIcon, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import GeoNodeLastUpdated from 'ee/geo_nodes_beta/components/header/geo_node_last_updated.vue';
+import GeoNodeLastUpdated from 'ee/geo_nodes/components/header/geo_node_last_updated.vue';
 import {
   HELP_NODE_HEALTH_URL,
   GEO_TROUBLESHOOTING_URL,
   STATUS_DELAY_THRESHOLD_MS,
-} from 'ee/geo_nodes_beta/constants';
+} from 'ee/geo_nodes/constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import { differenceInMilliseconds } from '~/lib/utils/datetime_utility';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';

ee/spec/frontend/geo_nodes_beta/store/actions_spec.js → ee/spec/frontend/geo_nodes/store/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
-import * as actions from 'ee/geo_nodes_beta/store/actions';
-import * as types from 'ee/geo_nodes_beta/store/mutation_types';
-import createState from 'ee/geo_nodes_beta/store/state';
+import * as actions from 'ee/geo_nodes/store/actions';
+import * as types from 'ee/geo_nodes/store/mutation_types';
+import createState from 'ee/geo_nodes/store/state';
 import testAction from 'helpers/vuex_action_helper';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
@@ -15,7 +15,7 @@ import {
 
 jest.mock('~/flash');
 
-describe('GeoNodesBeta Store Actions', () => {
+describe('GeoNodes Store Actions', () => {
   let mock;
   let state;
 

ee/spec/frontend/geo_nodes_beta/store/getters_spec.js → ee/spec/frontend/geo_nodes/store/getters_spec.js

-import * as getters from 'ee/geo_nodes_beta/store/getters';
-import createState from 'ee/geo_nodes_beta/store/state';
+import * as getters from 'ee/geo_nodes/store/getters';
+import createState from 'ee/geo_nodes/store/state';
 import {
   MOCK_PRIMARY_VERSION,
   MOCK_REPLICABLE_TYPES,
@@ -9,7 +9,7 @@ import {
   MOCK_SECONDARY_SYNC_INFO,
 } from '../mock_data';
 
-describe('GeoNodesBeta Store Getters', () => {
+describe('GeoNodes Store Getters', () => {
   let state;
 
   beforeEach(() => {

ee/spec/frontend/geo_nodes_beta/store/mutations_spec.js → ee/spec/frontend/geo_nodes/store/mutations_spec.js

-import * as types from 'ee/geo_nodes_beta/store/mutation_types';
-import mutations from 'ee/geo_nodes_beta/store/mutations';
-import createState from 'ee/geo_nodes_beta/store/state';
+import * as types from 'ee/geo_nodes/store/mutation_types';
+import mutations from 'ee/geo_nodes/store/mutations';
+import createState from 'ee/geo_nodes/store/state';
 import { MOCK_PRIMARY_VERSION, MOCK_REPLICABLE_TYPES, MOCK_NODES } from '../mock_data';
 
-describe('GeoNodesBeta Store Mutations', () => {
+describe('GeoNodes Store Mutations', () => {
   let state;
   beforeEach(() => {
     state = createState({

ee/spec/requests/admin/geo/nodes_controller_spec.rb

@@ -13,17 +13,17 @@ RSpec.describe Admin::Geo::NodesController, :geo do
     login_as(admin)
   end
 
-  describe 'GET /geo/nodes_beta' do
+  describe 'GET /geo/nodes' do
     context 'with a valid license' do
       before do
         stub_licensed_features(geo: true)
       end
 
-      it 'renders the Geo Nodes Beta View', :aggregate_failures do
+      it 'renders the Geo Nodes View', :aggregate_failures do
         get admin_geo_nodes_path
 
         expect(response).to render_template(:index)
-        expect(response.body).to include('js-geo-nodes-beta')
+        expect(response.body).to include('js-geo-nodes')
       end
     end
 

qa/qa/ee/page/admin/geo/nodes/show.rb

@@ -7,7 +7,7 @@ module QA
         module Geo
           module Nodes
             class Show < QA::Page::Base
-              view 'ee/app/assets/javascripts/geo_nodes_beta/components/app.vue' do
+              view 'ee/app/assets/javascripts/geo_nodes/components/app.vue' do
                 element :add_site_button
               end