Skip to content
代码片段 群组 项目
未验证 提交 48aa1e16 编辑于 作者: Artur Fedorov's avatar Artur Fedorov 提交者: GitLab
浏览文件

Merge branch '511982-policies-move-user-select-to-shared' into 'master'

Move user select component to shared folder

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182044



Merged-by: default avatarArtur Fedorov <afedorov@gitlab.com>
Approved-by: default avatarAlexander Turinske <aturinske@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { GlButton, GlForm, GlCollapsibleListbox, GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { GlButton, GlForm, GlCollapsibleListbox, GlBadge, GlTooltipDirective } from '@gitlab/ui';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
import { EMPTY_TYPE, GROUP_TYPE, ROLE_TYPE, USER_TYPE } from 'ee/security_orchestration/constants'; import { EMPTY_TYPE, GROUP_TYPE, ROLE_TYPE, USER_TYPE } from 'ee/security_orchestration/constants';
import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
import SectionLayout from '../../section_layout.vue'; import SectionLayout from '../../section_layout.vue';
import { import {
ADD_APPROVER_LABEL, ADD_APPROVER_LABEL,
...@@ -9,7 +10,6 @@ import { ...@@ -9,7 +10,6 @@ import {
DEFAULT_APPROVER_DROPDOWN_TEXT, DEFAULT_APPROVER_DROPDOWN_TEXT,
} from '../lib/actions'; } from '../lib/actions';
import GroupSelect from './group_select.vue'; import GroupSelect from './group_select.vue';
import UserSelect from './user_select.vue';
import RoleSelect from './role_select.vue'; import RoleSelect from './role_select.vue';
export default { export default {
......
...@@ -4,7 +4,7 @@ import { s__ } from '~/locale'; ...@@ -4,7 +4,7 @@ import { s__ } from '~/locale';
import { helpPagePath } from '~/helpers/help_page_helper'; import { helpPagePath } from '~/helpers/help_page_helper';
import { isNumeric } from '~/lib/utils/number_utils'; import { isNumeric } from '~/lib/utils/number_utils';
import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { getIdFromGraphQLId } from '~/graphql_shared/utils';
import UserSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/user_select.vue'; import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
export default { export default {
SKIP_CI_PATH: helpPagePath('ci/pipelines/_index.md', { anchor: 'skip-a-pipeline' }), SKIP_CI_PATH: helpPagePath('ci/pipelines/_index.md', { anchor: 'skip-a-pipeline' }),
......
...@@ -4,7 +4,7 @@ import SectionLayout from 'ee/security_orchestration/components/policy_editor/se ...@@ -4,7 +4,7 @@ import SectionLayout from 'ee/security_orchestration/components/policy_editor/se
import ApproverSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/approver_select.vue'; import ApproverSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/approver_select.vue';
import { EMPTY_TYPE, GROUP_TYPE, ROLE_TYPE, USER_TYPE } from 'ee/security_orchestration/constants'; import { EMPTY_TYPE, GROUP_TYPE, ROLE_TYPE, USER_TYPE } from 'ee/security_orchestration/constants';
import GroupSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/group_select.vue'; import GroupSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/group_select.vue';
import UserSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/user_select.vue'; import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
import RoleSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/role_select.vue'; import RoleSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/role_select.vue';
describe('ApproverSelect', () => { describe('ApproverSelect', () => {
......
import { GlToggle } from '@gitlab/ui'; import { GlToggle } from '@gitlab/ui';
import SkipCiSelector from 'ee/security_orchestration/components/policy_editor/skip_ci_selector.vue'; import SkipCiSelector from 'ee/security_orchestration/components/policy_editor/skip_ci_selector.vue';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import UserSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/user_select.vue'; import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
describe('SkipCiSelector', () => { describe('SkipCiSelector', () => {
let wrapper; let wrapper;
......
...@@ -6,7 +6,7 @@ import waitForPromises from 'helpers/wait_for_promises'; ...@@ -6,7 +6,7 @@ import waitForPromises from 'helpers/wait_for_promises';
import searchProjectMembers from '~/graphql_shared/queries/project_user_members_search.query.graphql'; import searchProjectMembers from '~/graphql_shared/queries/project_user_members_search.query.graphql';
import searchGroupMembers from '~/graphql_shared/queries/group_users_search.query.graphql'; import searchGroupMembers from '~/graphql_shared/queries/group_users_search.query.graphql';
import createMockApollo from 'helpers/mock_apollo_helper'; import createMockApollo from 'helpers/mock_apollo_helper';
import UserSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/user_select.vue'; import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
import { NAMESPACE_TYPES } from 'ee/security_orchestration/constants'; import { NAMESPACE_TYPES } from 'ee/security_orchestration/constants';
Vue.use(VueApollo); Vue.use(VueApollo);
......
...@@ -4,7 +4,7 @@ import App from 'ee/security_orchestration/components/policy_editor/app.vue'; ...@@ -4,7 +4,7 @@ import App from 'ee/security_orchestration/components/policy_editor/app.vue';
import ApproverAction from 'ee/security_orchestration/components/policy_editor/scan_result/action/approver_action.vue'; import ApproverAction from 'ee/security_orchestration/components/policy_editor/scan_result/action/approver_action.vue';
import GroupSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/group_select.vue'; import GroupSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/group_select.vue';
import RoleSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/role_select.vue'; import RoleSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/role_select.vue';
import UserSelect from 'ee/security_orchestration/components/policy_editor/scan_result/action/user_select.vue'; import UserSelect from 'ee/security_orchestration/components/shared/user_select.vue';
import { import {
GROUP_TYPE, GROUP_TYPE,
ROLE_TYPE, ROLE_TYPE,
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册