Commit a733c26e authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'admin-dispatcher' into 'master'

Admin dispatcher JS imports

See merge request gitlab-org/gitlab-ce!16315
parents 1e6e95e5 56469fc7
...@@ -13,8 +13,6 @@ import groupAvatar from './group_avatar'; ...@@ -13,8 +13,6 @@ import groupAvatar from './group_avatar';
import GroupLabelSubscription from './group_label_subscription'; import GroupLabelSubscription from './group_label_subscription';
import LineHighlighter from './line_highlighter'; import LineHighlighter from './line_highlighter';
import groupsSelect from './groups_select'; import groupsSelect from './groups_select';
import initAdmin from './admin';
import NamespaceSelect from './namespace_select';
import NewCommitForm from './new_commit_form'; import NewCommitForm from './new_commit_form';
import Project from './project'; import Project from './project';
import projectAvatar from './project_avatar'; import projectAvatar from './project_avatar';
...@@ -51,14 +49,12 @@ import GfmAutoComplete from './gfm_auto_complete'; ...@@ -51,14 +49,12 @@ import GfmAutoComplete from './gfm_auto_complete';
import ShortcutsBlob from './shortcuts_blob'; import ShortcutsBlob from './shortcuts_blob';
import Star from './star'; import Star from './star';
import TreeView from './tree'; import TreeView from './tree';
import UsagePing from './usage_ping';
import VersionCheckImage from './version_check_image'; import VersionCheckImage from './version_check_image';
import Wikis from './wikis'; import Wikis from './wikis';
import ZenMode from './zen_mode'; import ZenMode from './zen_mode';
import initSettingsPanels from './settings_panels'; import initSettingsPanels from './settings_panels';
import initExperimentalFlags from './experimental_flags'; import initExperimentalFlags from './experimental_flags';
import PerformanceBar from './performance_bar'; import PerformanceBar from './performance_bar';
import initBroadcastMessagesForm from './broadcast_message';
import initNotes from './init_notes'; import initNotes from './init_notes';
import initLegacyFilters from './init_legacy_filters'; import initLegacyFilters from './init_legacy_filters';
import initIssuableSidebar from './init_issuable_sidebar'; import initIssuableSidebar from './init_issuable_sidebar';
...@@ -66,7 +62,6 @@ import initProjectVisibilitySelector from './project_visibility'; ...@@ -66,7 +62,6 @@ import initProjectVisibilitySelector from './project_visibility';
import GpgBadges from './gpg_badges'; import GpgBadges from './gpg_badges';
import initChangesDropdown from './init_changes_dropdown'; import initChangesDropdown from './init_changes_dropdown';
import NewGroupChild from './groups/new_group_child'; import NewGroupChild from './groups/new_group_child';
import AbuseReports from './abuse_reports';
import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils'; import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
import AjaxLoadingSpinner from './ajax_loading_spinner'; import AjaxLoadingSpinner from './ajax_loading_spinner';
import GlFieldErrors from './gl_field_errors'; import GlFieldErrors from './gl_field_errors';
...@@ -229,9 +224,6 @@ import Activities from './activities'; ...@@ -229,9 +224,6 @@ import Activities from './activities';
.then(callDefault) .then(callDefault)
.catch(fail); .catch(fail);
break; break;
case 'admin:projects:index':
new ProjectsList();
break;
case 'explore:groups:index': case 'explore:groups:index':
import('./pages/explore/groups') import('./pages/explore/groups')
.then(callDefault) .then(callDefault)
...@@ -443,15 +435,23 @@ import Activities from './activities'; ...@@ -443,15 +435,23 @@ import Activities from './activities';
new UsersSelect(); new UsersSelect();
break; break;
case 'groups:new': case 'groups:new':
case 'admin:groups:new':
case 'groups:create': case 'groups:create':
case 'admin:groups:create':
BindInOut.initAll(); BindInOut.initAll();
new Group(); new Group();
groupAvatar(); groupAvatar();
break; break;
case 'groups:edit': case 'admin:groups:create':
case 'admin:groups:new':
import('./pages/admin/groups/new')
.then(callDefault)
.catch(fail);
break;
case 'admin:groups:edit': case 'admin:groups:edit':
import('./pages/admin/groups/edit')
.then(callDefault)
.catch(fail);
break;
case 'groups:edit':
groupAvatar(); groupAvatar();
break; break;
case 'projects:tree:show': case 'projects:tree:show':
...@@ -567,8 +567,12 @@ import Activities from './activities'; ...@@ -567,8 +567,12 @@ import Activities from './activities';
case 'import:fogbugz:new_user_map': case 'import:fogbugz:new_user_map':
import('./pages/import/fogbugz/new_user_map').then(m => m.default()).catch(fail); import('./pages/import/fogbugz/new_user_map').then(m => m.default()).catch(fail);
break; break;
case 'profiles:personal_access_tokens:index':
case 'admin:impersonation_tokens:index': case 'admin:impersonation_tokens:index':
import('./pages/admin/impersonation_tokens')
.then(callDefault)
.catch(fail);
break;
case 'profiles:personal_access_tokens:index':
new DueDateSelectors(); new DueDateSelectors();
break; break;
case 'projects:clusters:show': case 'projects:clusters:show':
...@@ -603,29 +607,51 @@ import Activities from './activities'; ...@@ -603,29 +607,51 @@ import Activities from './activities';
// needed in rspec // needed in rspec
gl.u2fAuthenticate = u2fAuthenticate; gl.u2fAuthenticate = u2fAuthenticate;
case 'admin': case 'admin':
initAdmin(); import('./pages/admin')
.then(callDefault)
.catch(fail);
switch (path[1]) { switch (path[1]) {
case 'broadcast_messages': case 'broadcast_messages':
initBroadcastMessagesForm(); import('./pages/admin/broadcast_messages')
.then(callDefault)
.catch(fail);
break; break;
case 'cohorts': case 'cohorts':
new UsagePing(); import('./pages/admin/cohorts')
.then(callDefault)
.catch(fail);
break; break;
case 'groups': case 'groups':
new UsersSelect(); switch (path[2]) {
case 'show':
import('./pages/admin/groups/show')
.then(callDefault)
.catch(fail);
break;
}
break; break;
case 'projects': case 'projects':
document.querySelectorAll('.js-namespace-select') import('./pages/admin/projects')
.forEach(dropdown => new NamespaceSelect({ dropdown })); .then(callDefault)
.catch(fail);
break; break;
case 'labels': case 'labels':
switch (path[2]) { switch (path[2]) {
case 'new': case 'new':
import('./pages/admin/labels/new')
.then(callDefault)
.catch(fail);
break;
case 'edit': case 'edit':
new Labels(); import('./pages/admin/labels/edit')
.then(callDefault)
.catch(fail);
break;
} }
case 'abuse_reports': case 'abuse_reports':
new AbuseReports(); import('./pages/admin/abuse_reports')
.then(callDefault)
.catch(fail);
break; break;
} }
break; break;
......
import { truncate } from './lib/utils/text_utility'; import { truncate } from '../../../lib/utils/text_utility';
const MAX_MESSAGE_LENGTH = 500; const MAX_MESSAGE_LENGTH = 500;
const MESSAGE_CELL_SELECTOR = '.abuse-reports .message'; const MESSAGE_CELL_SELECTOR = '.abuse-reports .message';
......
import AbuseReports from './abuse_reports';
export default () => new AbuseReports();
import { refreshCurrentPage } from './lib/utils/url_utility'; import { refreshCurrentPage } from '../../lib/utils/url_utility';
function showBlacklistType() { function showBlacklistType() {
if ($('input[name="blacklist_type"]:checked').val() === 'file') { if ($('input[name="blacklist_type"]:checked').val() === 'file') {
......
import initBroadcastMessagesForm from './broadcast_message';
export default () => initBroadcastMessagesForm();
import initUsagePing from './usage_ping';
export default () => initUsagePing();
import groupAvatar from '../../../../group_avatar';
export default () => groupAvatar();
import BindInOut from '../../../../behaviors/bind_in_out';
import Group from '../../../../group';
import groupAvatar from '../../../../group_avatar';
export default () => {
BindInOut.initAll();
new Group(); // eslint-disable-line no-new
groupAvatar();
};
import UsersSelect from '../../../../users_select';
export default () => new UsersSelect();
import DueDateSelectors from '../../../due_date_select';
export default () => new DueDateSelectors();
import initAdmin from './admin';
export default () => initAdmin();
import Labels from '../../../../labels';
export default () => new Labels();
import Labels from '../../../../labels';
export default () => new Labels();
import ProjectsList from '../../../projects_list';
import NamespaceSelect from '../../../namespace_select';
export default () => {
new ProjectsList(); // eslint-disable-line no-new
document.querySelectorAll('.js-namespace-select')
.forEach(dropdown => new NamespaceSelect({ dropdown }));
};
import '~/lib/utils/text_utility'; import '~/lib/utils/text_utility';
import AbuseReports from '~/abuse_reports'; import AbuseReports from '~/pages/admin/abuse_reports/abuse_reports';
describe('Abuse Reports', () => { describe('Abuse Reports', () => {
const FIXTURE = 'abuse_reports/abuse_reports_list.html.raw'; const FIXTURE = 'abuse_reports/abuse_reports_list.html.raw';
......
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