Commit 5bd234e9 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '346533-move-seat-usage-to-usage-quotas' into 'master'

Update seat_usage references

See merge request gitlab-org/gitlab!78450
parents a7386773 f1ab2925
import $ from 'jquery'; import $ from 'jquery';
import SeatUsageApp from 'ee/seat_usage'; import SeatUsageApp from 'ee/usage_quotas/seats';
import initNamespaceStorage from 'ee/usage_quotas/storage/init_namespace_storage'; import initNamespaceStorage from 'ee/usage_quotas/storage/init_namespace_storage';
import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
......
...@@ -12,7 +12,7 @@ import { ...@@ -12,7 +12,7 @@ import {
GlLoadingIcon, GlLoadingIcon,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
import { AVATAR_SIZE } from 'ee/seat_usage/constants'; import { AVATAR_SIZE } from 'ee/usage_quotas/seats/constants';
import { import {
AWAITING_MEMBER_SIGNUP_TEXT, AWAITING_MEMBER_SIGNUP_TEXT,
LABEL_APPROVE, LABEL_APPROVE,
......
...@@ -10,7 +10,7 @@ import { mapActions, mapState } from 'vuex'; ...@@ -10,7 +10,7 @@ import { mapActions, mapState } from 'vuex';
import { import {
REMOVE_BILLABLE_MEMBER_MODAL_ID, REMOVE_BILLABLE_MEMBER_MODAL_ID,
REMOVE_BILLABLE_MEMBER_MODAL_CONTENT_TEXT_TEMPLATE, REMOVE_BILLABLE_MEMBER_MODAL_CONTENT_TEXT_TEMPLATE,
} from 'ee/seat_usage/constants'; } from 'ee/usage_quotas/seats/constants';
import csrf from '~/lib/utils/csrf'; import csrf from '~/lib/utils/csrf';
import { __, s__, sprintf } from '~/locale'; import { __, s__, sprintf } from '~/locale';
......
...@@ -22,7 +22,7 @@ import { ...@@ -22,7 +22,7 @@ import {
CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_TITLE, CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_TITLE,
CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_CONTENT, CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_CONTENT,
SORT_OPTIONS, SORT_OPTIONS,
} from 'ee/seat_usage/constants'; } from 'ee/usage_quotas/seats/constants';
import { s__, __, sprintf, n__ } from '~/locale'; import { s__, __, sprintf, n__ } from '~/locale';
import FilterSortContainerRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import FilterSortContainerRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
import RemoveBillableMemberModal from './remove_billable_member_modal.vue'; import RemoveBillableMemberModal from './remove_billable_member_modal.vue';
......
...@@ -3,7 +3,7 @@ import { ...@@ -3,7 +3,7 @@ import {
HEADER_TOTAL_ENTRIES, HEADER_TOTAL_ENTRIES,
HEADER_PAGE_NUMBER, HEADER_PAGE_NUMBER,
HEADER_ITEMS_PER_PAGE, HEADER_ITEMS_PER_PAGE,
} from 'ee/seat_usage/constants'; } from 'ee/usage_quotas/seats/constants';
import * as types from './mutation_types'; import * as types from './mutation_types';
export default { export default {
......
...@@ -2,7 +2,7 @@ import { GlSprintf } from '@gitlab/ui'; ...@@ -2,7 +2,7 @@ import { GlSprintf } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue, { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import RemoveBillableMemberModal from 'ee/seat_usage/components/remove_billable_member_modal.vue'; import RemoveBillableMemberModal from 'ee/usage_quotas/seats/components/remove_billable_member_modal.vue';
Vue.use(Vuex); Vue.use(Vuex);
......
...@@ -3,11 +3,11 @@ import { shallowMount } from '@vue/test-utils'; ...@@ -3,11 +3,11 @@ import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import Api from 'ee/api'; import Api from 'ee/api';
import SubscriptionSeatDetails from 'ee/seat_usage/components/subscription_seat_details.vue'; import SubscriptionSeatDetails from 'ee/usage_quotas/seats/components/subscription_seat_details.vue';
import SubscriptionSeatDetailsLoader from 'ee/seat_usage/components/subscription_seat_details_loader.vue'; import SubscriptionSeatDetailsLoader from 'ee/usage_quotas/seats/components/subscription_seat_details_loader.vue';
import createStore from 'ee/seat_usage/store'; import createStore from 'ee/usage_quotas/seats/store';
import initState from 'ee/seat_usage/store/state'; import initState from 'ee/usage_quotas/seats/store/state';
import { mockMemberDetails } from 'ee_jest/seat_usage/mock_data'; import { mockMemberDetails } from 'ee_jest/usage_quotas/seats/mock_data';
import { stubComponent } from 'helpers/stub_component'; import { stubComponent } from 'helpers/stub_component';
Vue.use(Vuex); Vue.use(Vuex);
......
...@@ -11,9 +11,9 @@ import { ...@@ -11,9 +11,9 @@ import {
import { mount, shallowMount } from '@vue/test-utils'; import { mount, shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import SubscriptionSeats from 'ee/seat_usage/components/subscription_seats.vue'; import SubscriptionSeats from 'ee/usage_quotas/seats/components/subscription_seats.vue';
import { CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_CONTENT } from 'ee/seat_usage/constants'; import { CANNOT_REMOVE_BILLABLE_MEMBER_MODAL_CONTENT } from 'ee/usage_quotas/seats/constants';
import { mockDataSeats, mockTableItems } from 'ee_jest/seat_usage/mock_data'; import { mockDataSeats, mockTableItems } from 'ee_jest/usage_quotas/seats/mock_data';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import FilterSortContainerRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import FilterSortContainerRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
......
...@@ -2,7 +2,7 @@ import { ...@@ -2,7 +2,7 @@ import {
HEADER_TOTAL_ENTRIES, HEADER_TOTAL_ENTRIES,
HEADER_PAGE_NUMBER, HEADER_PAGE_NUMBER,
HEADER_ITEMS_PER_PAGE, HEADER_ITEMS_PER_PAGE,
} from 'ee/seat_usage/constants'; } from 'ee/usage_quotas/seats/constants';
export const mockDataSeats = { export const mockDataSeats = {
data: [ data: [
......
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import * as GroupsApi from 'ee/api/groups_api'; import * as GroupsApi from 'ee/api/groups_api';
import * as actions from 'ee/seat_usage/store/actions'; import * as actions from 'ee/usage_quotas/seats/store/actions';
import * as types from 'ee/seat_usage/store/mutation_types'; import * as types from 'ee/usage_quotas/seats/store/mutation_types';
import State from 'ee/seat_usage/store/state'; import State from 'ee/usage_quotas/seats/store/state';
import { mockDataSeats, mockMemberDetails } from 'ee_jest/seat_usage/mock_data'; import { mockDataSeats, mockMemberDetails } from 'ee_jest/usage_quotas/seats/mock_data';
import testAction from 'helpers/vuex_action_helper'; import testAction from 'helpers/vuex_action_helper';
import createFlash, { FLASH_TYPES } from '~/flash'; import createFlash, { FLASH_TYPES } from '~/flash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
......
import * as getters from 'ee/seat_usage/store/getters'; import * as getters from 'ee/usage_quotas/seats/store/getters';
import State from 'ee/seat_usage/store/state'; import State from 'ee/usage_quotas/seats/store/state';
import { mockDataSeats, mockTableItems, mockMemberDetails } from 'ee_jest/seat_usage/mock_data'; import {
mockDataSeats,
mockTableItems,
mockMemberDetails,
} from 'ee_jest/usage_quotas/seats/mock_data';
describe('Seat usage table getters', () => { describe('Seat usage table getters', () => {
let state; let state;
......
import * as types from 'ee/seat_usage/store/mutation_types'; import * as types from 'ee/usage_quotas/seats/store/mutation_types';
import mutations from 'ee/seat_usage/store/mutations'; import mutations from 'ee/usage_quotas/seats/store/mutations';
import createState from 'ee/seat_usage/store/state'; import createState from 'ee/usage_quotas/seats/store/state';
import { mockDataSeats, mockMemberDetails } from 'ee_jest/seat_usage/mock_data'; import { mockDataSeats, mockMemberDetails } from 'ee_jest/usage_quotas/seats/mock_data';
describe('EE seats module mutations', () => { describe('EE seats module mutations', () => {
let state; let state;
......
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