diff --git a/ui/src/admin/constants/chronografAdmin.js b/ui/src/admin/constants/chronografAdmin.js index 122e54a505..69079c0611 100644 --- a/ui/src/admin/constants/chronografAdmin.js +++ b/ui/src/admin/constants/chronografAdmin.js @@ -11,25 +11,5 @@ export const USER_ROLES = [ {name: EDITOR_ROLE}, {name: ADMIN_ROLE}, ] + export const DEFAULT_ORG_ID = '0' -export const DEFAULT_ORG_NAME = '__default' -export const DEFAULT_ORG = { - id: DEFAULT_ORG_ID, - name: DEFAULT_ORG_NAME, -} -export const NO_ORG = 'No Org' - -export const DUMMY_ORGS = [ - {id: DEFAULT_ORG_ID, name: DEFAULT_ORG_NAME}, - {name: NO_ORG}, - {id: '1', name: 'Red Team'}, - {id: '2', name: 'Blue Team'}, - {id: '3', name: 'Green Team'}, -] - -export const SUPERADMIN_OPTION_ITEMS = [ - {value: true, text: 'yes'}, - {value: false, text: 'no'}, -] - -export const ADD_TO_ORGANIZATION = 'Add to organization' diff --git a/ui/src/shared/reducers/auth.js b/ui/src/shared/reducers/auth.js index 047f350bf2..f11948b8ff 100644 --- a/ui/src/shared/reducers/auth.js +++ b/ui/src/shared/reducers/auth.js @@ -8,8 +8,6 @@ const getInitialState = () => ({ import {getMeRole} from 'shared/reducers/helpers/auth' -import {DEFAULT_ORG_NAME} from 'src/admin/constants/chronografAdmin' - export const initialState = getInitialState() const authReducer = (state = initialState, action) => { @@ -43,7 +41,7 @@ const authReducer = (state = initialState, action) => { me: { ...me, role: getMeRole(me), - currentOrganization: currentOrganization || DEFAULT_ORG_NAME, // TODO: make sure currentOrganization is received as non-superadmin + currentOrganization, }, isMeLoading: false, }