Commit e626a4ed authored by Zack Cuddy's avatar Zack Cuddy

Geo Nodes - Takeover geo_nodes namespace

This changes replaces the
geo_nodes_beta namespace
with geo_nodes.

Also it removes any wording/naming referencing beta.
parent 95667afb
...@@ -7,7 +7,7 @@ import GeoNodes from './geo_nodes.vue'; ...@@ -7,7 +7,7 @@ import GeoNodes from './geo_nodes.vue';
import GeoNodesEmptyState from './geo_nodes_empty_state.vue'; import GeoNodesEmptyState from './geo_nodes_empty_state.vue';
export default { export default {
name: 'GeoNodesBetaApp', name: 'GeoNodesApp',
i18n: { i18n: {
geoSites: s__('Geo|Geo sites'), geoSites: s__('Geo|Geo sites'),
helpText: s__( helpText: s__(
......
<script> <script>
import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui'; import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui';
import { mapGetters } from 'vuex'; 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 { s__, __ } from '~/locale';
import GeoNodeProgressBar from '../geo_node_progress_bar.vue'; import GeoNodeProgressBar from '../geo_node_progress_bar.vue';
......
<script> <script>
import { mapGetters } from 'vuex'; 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 { __, s__ } from '~/locale';
import GeoNodeReplicationSyncPercentage from './geo_node_replication_sync_percentage.vue'; import GeoNodeReplicationSyncPercentage from './geo_node_replication_sync_percentage.vue';
......
<script> <script>
import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui'; import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui';
import { mapGetters, mapState } from 'vuex'; 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 { s__, __ } from '~/locale';
import GeoNodeReplicationDetailsResponsive from './geo_node_replication_details_responsive.vue'; import GeoNodeReplicationDetailsResponsive from './geo_node_replication_details_responsive.vue';
import GeoNodeReplicationStatusMobile from './geo_node_replication_status_mobile.vue'; import GeoNodeReplicationStatusMobile from './geo_node_replication_status_mobile.vue';
......
<script> <script>
import { GlIcon, GlPopover, GlLink } from '@gitlab/ui'; import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
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';
import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants'; import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
export default { export default {
......
<script> <script>
import { GlIcon, GlPopover, GlLink } from '@gitlab/ui'; 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'; import { __, s__ } from '~/locale';
export default { export default {
......
<script> <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 { export default {
name: 'GeoNodeReplicationStatusMobile', name: 'GeoNodeReplicationStatusMobile',
......
<script> <script>
import { mapActions } from 'vuex'; 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 { BV_SHOW_MODAL } from '~/lib/utils/constants';
import GeoNodeActionsDesktop from './geo_node_actions_desktop.vue'; import GeoNodeActionsDesktop from './geo_node_actions_desktop.vue';
import GeoNodeActionsMobile from './geo_node_actions_mobile.vue'; import GeoNodeActionsMobile from './geo_node_actions_mobile.vue';
......
<script> <script>
import { GlIcon, GlBadge } from '@gitlab/ui'; 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 { export default {
components: { components: {
......
...@@ -4,7 +4,7 @@ import { ...@@ -4,7 +4,7 @@ import {
HELP_NODE_HEALTH_URL, HELP_NODE_HEALTH_URL,
GEO_TROUBLESHOOTING_URL, GEO_TROUBLESHOOTING_URL,
STATUS_DELAY_THRESHOLD_MS, STATUS_DELAY_THRESHOLD_MS,
} from 'ee/geo_nodes_beta/constants'; } from 'ee/geo_nodes/constants';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
......
import Vue from 'vue'; import Vue from 'vue';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import Translate from '~/vue_shared/translate'; import Translate from '~/vue_shared/translate';
import GeoNodesBetaApp from './components/app.vue'; import GeoNodesApp from './components/app.vue';
import createStore from './store'; import createStore from './store';
Vue.use(Translate); Vue.use(Translate);
export const initGeoNodesBeta = () => { export const initGeoNodes = () => {
const el = document.getElementById('js-geo-nodes-beta'); const el = document.getElementById('js-geo-nodes');
if (!el) { if (!el) {
return false; return false;
...@@ -22,7 +22,7 @@ export const initGeoNodesBeta = () => { ...@@ -22,7 +22,7 @@ export const initGeoNodesBeta = () => {
el, el,
store: createStore({ primaryVersion, primaryRevision, replicableTypes }), store: createStore({ primaryVersion, primaryRevision, replicableTypes }),
render(createElement) { render(createElement) {
return createElement(GeoNodesBetaApp, { return createElement(GeoNodesApp, {
props: { props: {
newNodeUrl, newNodeUrl,
geoNodesEmptyStateSvg, geoNodesEmptyStateSvg,
......
import { initGeoNodesBeta } from 'ee/geo_nodes_beta'; import { initGeoNodes } from 'ee/geo_nodes';
initGeoNodesBeta(); initGeoNodes();
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
= render_migrate_hashed_storage_warning = render_migrate_hashed_storage_warning
= render partial: 'admin/geo/shared/license_alert' = render partial: 'admin/geo/shared/license_alert'
#js-geo-nodes-beta{ data: node_vue_list_properties } #js-geo-nodes{ data: node_vue_list_properties }
...@@ -2,16 +2,16 @@ import { GlLink, GlButton, GlLoadingIcon, GlModal, GlSprintf } from '@gitlab/ui' ...@@ -2,16 +2,16 @@ import { GlLink, GlButton, GlLoadingIcon, GlModal, GlSprintf } from '@gitlab/ui'
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GeoNodesBetaApp from 'ee/geo_nodes_beta/components/app.vue'; import GeoNodesApp from 'ee/geo_nodes/components/app.vue';
import GeoNodes from 'ee/geo_nodes_beta/components/geo_nodes.vue'; import GeoNodes from 'ee/geo_nodes/components/geo_nodes.vue';
import GeoNodesEmptyState from 'ee/geo_nodes_beta/components/geo_nodes_empty_state.vue'; import GeoNodesEmptyState from 'ee/geo_nodes/components/geo_nodes_empty_state.vue';
import { GEO_INFO_URL } from 'ee/geo_nodes_beta/constants'; import { GEO_INFO_URL } from 'ee/geo_nodes/constants';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import { MOCK_NODES, MOCK_NEW_NODE_URL, MOCK_EMPTY_STATE_SVG } from '../mock_data'; import { MOCK_NODES, MOCK_NEW_NODE_URL, MOCK_EMPTY_STATE_SVG } from '../mock_data';
Vue.use(Vuex); Vue.use(Vuex);
describe('GeoNodesBetaApp', () => { describe('GeoNodesApp', () => {
let wrapper; let wrapper;
const actionSpies = { const actionSpies = {
...@@ -34,7 +34,7 @@ describe('GeoNodesBetaApp', () => { ...@@ -34,7 +34,7 @@ describe('GeoNodesBetaApp', () => {
}); });
wrapper = extendedWrapper( wrapper = extendedWrapper(
shallowMount(GeoNodesBetaApp, { shallowMount(GeoNodesApp, {
store, store,
propsData: { propsData: {
...defaultProps, ...defaultProps,
...@@ -49,7 +49,7 @@ describe('GeoNodesBetaApp', () => { ...@@ -49,7 +49,7 @@ describe('GeoNodesBetaApp', () => {
wrapper.destroy(); wrapper.destroy();
}); });
const findGeoNodesBetaContainer = () => wrapper.find('section'); const findGeoNodesAppContainer = () => wrapper.find('section');
const findGeoLearnMoreLink = () => wrapper.findComponent(GlLink); const findGeoLearnMoreLink = () => wrapper.findComponent(GlLink);
const findGeoAddSiteButton = () => wrapper.findComponent(GlButton); const findGeoAddSiteButton = () => wrapper.findComponent(GlButton);
const findGlLoadingIcon = () => wrapper.findComponent(GlLoadingIcon); const findGlLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
...@@ -65,8 +65,8 @@ describe('GeoNodesBetaApp', () => { ...@@ -65,8 +65,8 @@ describe('GeoNodesBetaApp', () => {
createComponent(); createComponent();
}); });
it('renders the Geo Nodes Beta Container', () => { it('renders the Geo Nodes App Container', () => {
expect(findGeoNodesBetaContainer().exists()).toBe(true); expect(findGeoNodesAppContainer().exists()).toBe(true);
}); });
it('renders the Learn more link correctly', () => { it('renders the Learn more link correctly', () => {
......
...@@ -2,12 +2,12 @@ import { GlLink } from '@gitlab/ui'; ...@@ -2,12 +2,12 @@ import { GlLink } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; 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 { import {
MOCK_PRIMARY_VERSION, MOCK_PRIMARY_VERSION,
MOCK_REPLICABLE_TYPES, MOCK_REPLICABLE_TYPES,
MOCK_NODES, 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'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
Vue.use(Vuex); Vue.use(Vuex);
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
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 GeoNodeDetails from 'ee/geo_nodes_beta/components/details/geo_node_details.vue'; import GeoNodeDetails from 'ee/geo_nodes/components/details/geo_node_details.vue';
import GeoNodePrimaryOtherInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_primary_other_info.vue'; import GeoNodePrimaryOtherInfo from 'ee/geo_nodes/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 GeoNodeVerificationInfo from 'ee/geo_nodes/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 GeoNodeReplicationDetails from 'ee/geo_nodes/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 GeoNodeReplicationSummary from 'ee/geo_nodes/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 GeoNodeSecondaryOtherInfo from 'ee/geo_nodes/components/details/secondary_node/geo_node_secondary_other_info.vue';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeDetails', () => { describe('GeoNodeDetails', () => {
......
import { GlPopover } from '@gitlab/ui'; import { GlPopover } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
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';
import { MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes/mock_data';
import StackedProgressBar from '~/vue_shared/components/stacked_progress_bar.vue'; import StackedProgressBar from '~/vue_shared/components/stacked_progress_bar.vue';
describe('GeoNodeProgressBar', () => { describe('GeoNodeProgressBar', () => {
......
import { GlCard } from '@gitlab/ui'; import { GlCard } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
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';
import GeoNodePrimaryOtherInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_primary_other_info.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_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import { numberToHumanSize } from '~/lib/utils/number_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils';
......
...@@ -2,10 +2,10 @@ import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui'; ...@@ -2,10 +2,10 @@ import { GlCard, GlIcon, GlPopover, GlLink } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
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';
import GeoNodeVerificationInfo from 'ee/geo_nodes_beta/components/details/primary_node/geo_node_verification_info.vue'; import GeoNodeVerificationInfo from 'ee/geo_nodes/components/details/primary_node/geo_node_verification_info.vue';
import { HELP_INFO_URL } from 'ee/geo_nodes_beta/constants'; import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
import { MOCK_NODES, MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES, MOCK_PRIMARY_VERIFICATION_INFO } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
Vue.use(Vuex); Vue.use(Vuex);
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue'; import GeoNodeReplicationCounts from 'ee/geo_nodes/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 GeoNodeReplicationSyncPercentage from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants'; import { REPOSITORY, BLOB } from 'ee/geo_nodes/constants';
import { import {
MOCK_NODES, MOCK_NODES,
MOCK_SECONDARY_SYNC_INFO, MOCK_SECONDARY_SYNC_INFO,
MOCK_PRIMARY_VERIFICATION_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'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
Vue.use(Vuex); Vue.use(Vuex);
......
import { GlIcon, GlPopover, GlLink } from '@gitlab/ui'; import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
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';
import GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details_responsive.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_beta/constants'; import { HELP_INFO_URL } from 'ee/geo_nodes/constants';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeReplicationDetailsResponsive', () => { describe('GeoNodeReplicationDetailsResponsive', () => {
......
...@@ -2,11 +2,11 @@ import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui'; ...@@ -2,11 +2,11 @@ import { GlIcon, GlPopover, GlLink, GlButton } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GeoNodeReplicationDetails from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_details.vue'; import GeoNodeReplicationDetails from 'ee/geo_nodes/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 GeoNodeReplicationDetailsResponsive from 'ee/geo_nodes/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 GeoNodeReplicationStatusMobile from 'ee/geo_nodes/components/details/secondary_node/geo_node_replication_status_mobile.vue';
import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes_beta/constants'; import { GEO_REPLICATION_TYPES_URL } from 'ee/geo_nodes/constants';
import { MOCK_NODES, MOCK_REPLICABLE_TYPES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES, MOCK_REPLICABLE_TYPES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
Vue.use(Vuex); Vue.use(Vuex);
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
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';
import GeoNodeReplicationStatusMobile from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status_mobile.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'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeReplicationStatusMobile', () => { describe('GeoNodeReplicationStatusMobile', () => {
......
import { GlPopover, GlLink } from '@gitlab/ui'; import { GlPopover, GlLink } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeReplicationStatus from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_status.vue'; 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_beta/constants'; import { REPLICATION_STATUS_UI, REPLICATION_PAUSE_URL } from 'ee/geo_nodes/constants';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeReplicationStatus', () => { describe('GeoNodeReplicationStatus', () => {
......
import { GlButton, GlCard } from '@gitlab/ui'; import { GlButton, GlCard } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue'; import GeoNodeReplicationCounts from 'ee/geo_nodes/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 GeoNodeReplicationStatus from 'ee/geo_nodes/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 GeoNodeReplicationSummary from 'ee/geo_nodes/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 GeoNodeSyncSettings from 'ee/geo_nodes/components/details/secondary_node/geo_node_sync_settings.vue';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
describe('GeoNodeReplicationSummary', () => { describe('GeoNodeReplicationSummary', () => {
let wrapper; let wrapper;
......
import { shallowMount } from '@vue/test-utils'; 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', () => { describe('GeoNodeReplicationSyncPercentage', () => {
let wrapper; let wrapper;
......
import { GlSprintf } from '@gitlab/ui'; import { GlSprintf } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeSecondaryOtherInfo from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_secondary_other_info.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_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeSyncSettings from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_sync_settings.vue'; import GeoNodeSyncSettings from 'ee/geo_nodes/components/details/secondary_node/geo_node_sync_settings.vue';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeSyncSettings', () => { describe('GeoNodeSyncSettings', () => {
......
import { GlEmptyState } from '@gitlab/ui'; import { GlEmptyState } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodesEmptyState from 'ee/geo_nodes_beta/components/geo_nodes_empty_state.vue'; import GeoNodesEmptyState from 'ee/geo_nodes/components/geo_nodes_empty_state.vue';
import { GEO_FEATURE_URL } from 'ee/geo_nodes_beta/constants'; import { GEO_FEATURE_URL } from 'ee/geo_nodes/constants';
import { MOCK_EMPTY_STATE_SVG } from '../mock_data'; import { MOCK_EMPTY_STATE_SVG } from '../mock_data';
describe('GeoNodesEmptyState', () => { describe('GeoNodesEmptyState', () => {
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeDetails from 'ee/geo_nodes_beta/components/details/geo_node_details.vue'; import GeoNodeDetails from 'ee/geo_nodes/components/details/geo_node_details.vue';
import GeoNodes from 'ee/geo_nodes_beta/components/geo_nodes.vue'; import GeoNodes from 'ee/geo_nodes/components/geo_nodes.vue';
import GeoNodeHeader from 'ee/geo_nodes_beta/components/header/geo_node_header.vue'; import GeoNodeHeader from 'ee/geo_nodes/components/header/geo_node_header.vue';
import { MOCK_NODES } from '../mock_data'; import { MOCK_NODES } from '../mock_data';
describe('GeoNodes', () => { describe('GeoNodes', () => {
......
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeActionsDesktop from 'ee/geo_nodes_beta/components/header/geo_node_actions_desktop.vue'; import GeoNodeActionsDesktop from 'ee/geo_nodes/components/header/geo_node_actions_desktop.vue';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeActionsDesktop', () => { describe('GeoNodeActionsDesktop', () => {
......
import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeActionsMobile from 'ee/geo_nodes_beta/components/header/geo_node_actions_mobile.vue'; import GeoNodeActionsMobile from 'ee/geo_nodes/components/header/geo_node_actions_mobile.vue';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
describe('GeoNodeActionsMobile', () => { describe('GeoNodeActionsMobile', () => {
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GeoNodeActions from 'ee/geo_nodes_beta/components/header/geo_node_actions.vue'; import GeoNodeActions from 'ee/geo_nodes/components/header/geo_node_actions.vue';
import GeoNodeActionsDesktop from 'ee/geo_nodes_beta/components/header/geo_node_actions_desktop.vue'; import GeoNodeActionsDesktop from 'ee/geo_nodes/components/header/geo_node_actions_desktop.vue';
import GeoNodeActionsMobile from 'ee/geo_nodes_beta/components/header/geo_node_actions_mobile.vue'; import GeoNodeActionsMobile from 'ee/geo_nodes/components/header/geo_node_actions_mobile.vue';
import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes_beta/constants'; import { REMOVE_NODE_MODAL_ID } from 'ee/geo_nodes/constants';
import { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { BV_SHOW_MODAL } from '~/lib/utils/constants';
......
import { GlButton, GlBadge } from '@gitlab/ui'; import { GlButton, GlBadge } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeActions from 'ee/geo_nodes_beta/components/header/geo_node_actions.vue'; import GeoNodeActions from 'ee/geo_nodes/components/header/geo_node_actions.vue';
import GeoNodeHeader from 'ee/geo_nodes_beta/components/header/geo_node_header.vue'; import GeoNodeHeader from 'ee/geo_nodes/components/header/geo_node_header.vue';
import GeoNodeHealthStatus from 'ee/geo_nodes_beta/components/header/geo_node_health_status.vue'; import GeoNodeHealthStatus from 'ee/geo_nodes/components/header/geo_node_health_status.vue';
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 { MOCK_NODES } from 'ee_jest/geo_nodes_beta/mock_data'; import { MOCK_NODES } from 'ee_jest/geo_nodes/mock_data';
describe('GeoNodeHeader', () => { describe('GeoNodeHeader', () => {
let wrapper; let wrapper;
......
import { GlIcon, GlBadge } from '@gitlab/ui'; import { GlIcon, GlBadge } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import GeoNodeHealthStatus from 'ee/geo_nodes_beta/components/header/geo_node_health_status.vue'; import GeoNodeHealthStatus from 'ee/geo_nodes/components/header/geo_node_health_status.vue';
import { HEALTH_STATUS_UI } from 'ee/geo_nodes_beta/constants'; import { HEALTH_STATUS_UI } from 'ee/geo_nodes/constants';
describe('GeoNodeHealthStatus', () => { describe('GeoNodeHealthStatus', () => {
let wrapper; let wrapper;
......
import { GlPopover, GlLink, GlIcon, GlSprintf } from '@gitlab/ui'; import { GlPopover, GlLink, GlIcon, GlSprintf } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; 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 { import {
HELP_NODE_HEALTH_URL, HELP_NODE_HEALTH_URL,
GEO_TROUBLESHOOTING_URL, GEO_TROUBLESHOOTING_URL,
STATUS_DELAY_THRESHOLD_MS, STATUS_DELAY_THRESHOLD_MS,
} from 'ee/geo_nodes_beta/constants'; } from 'ee/geo_nodes/constants';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; import { differenceInMilliseconds } from '~/lib/utils/datetime_utility';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
......
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import * as actions from 'ee/geo_nodes_beta/store/actions'; import * as actions from 'ee/geo_nodes/store/actions';
import * as types from 'ee/geo_nodes_beta/store/mutation_types'; import * as types from 'ee/geo_nodes/store/mutation_types';
import createState from 'ee/geo_nodes_beta/store/state'; import createState from 'ee/geo_nodes/store/state';
import testAction from 'helpers/vuex_action_helper'; import testAction from 'helpers/vuex_action_helper';
import createFlash from '~/flash'; import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
...@@ -15,7 +15,7 @@ import { ...@@ -15,7 +15,7 @@ import {
jest.mock('~/flash'); jest.mock('~/flash');
describe('GeoNodesBeta Store Actions', () => { describe('GeoNodes Store Actions', () => {
let mock; let mock;
let state; let state;
......
import * as getters from 'ee/geo_nodes_beta/store/getters'; import * as getters from 'ee/geo_nodes/store/getters';
import createState from 'ee/geo_nodes_beta/store/state'; import createState from 'ee/geo_nodes/store/state';
import { import {
MOCK_PRIMARY_VERSION, MOCK_PRIMARY_VERSION,
MOCK_REPLICABLE_TYPES, MOCK_REPLICABLE_TYPES,
...@@ -9,7 +9,7 @@ import { ...@@ -9,7 +9,7 @@ import {
MOCK_SECONDARY_SYNC_INFO, MOCK_SECONDARY_SYNC_INFO,
} from '../mock_data'; } from '../mock_data';
describe('GeoNodesBeta Store Getters', () => { describe('GeoNodes Store Getters', () => {
let state; let state;
beforeEach(() => { beforeEach(() => {
......
import * as types from 'ee/geo_nodes_beta/store/mutation_types'; import * as types from 'ee/geo_nodes/store/mutation_types';
import mutations from 'ee/geo_nodes_beta/store/mutations'; import mutations from 'ee/geo_nodes/store/mutations';
import createState from 'ee/geo_nodes_beta/store/state'; import createState from 'ee/geo_nodes/store/state';
import { MOCK_PRIMARY_VERSION, MOCK_REPLICABLE_TYPES, MOCK_NODES } from '../mock_data'; import { MOCK_PRIMARY_VERSION, MOCK_REPLICABLE_TYPES, MOCK_NODES } from '../mock_data';
describe('GeoNodesBeta Store Mutations', () => { describe('GeoNodes Store Mutations', () => {
let state; let state;
beforeEach(() => { beforeEach(() => {
state = createState({ state = createState({
......
...@@ -13,17 +13,17 @@ RSpec.describe Admin::Geo::NodesController, :geo do ...@@ -13,17 +13,17 @@ RSpec.describe Admin::Geo::NodesController, :geo do
login_as(admin) login_as(admin)
end end
describe 'GET /geo/nodes_beta' do describe 'GET /geo/nodes' do
context 'with a valid license' do context 'with a valid license' do
before do before do
stub_licensed_features(geo: true) stub_licensed_features(geo: true)
end 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 get admin_geo_nodes_path
expect(response).to render_template(:index) 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
end end
......
...@@ -7,7 +7,7 @@ module QA ...@@ -7,7 +7,7 @@ module QA
module Geo module Geo
module Nodes module Nodes
class Show < QA::Page::Base 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 element :add_site_button
end end
......
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