Merge branch 'ee-dispatcher-projects' into 'master'

Ee dispatcher projects

See merge request gitlab-org/gitlab-ee!4117

app/assets/javascripts/dispatcher.js

@@ -9,11 +9,9 @@ import notificationsDropdown from './notifications_dropdown';
 import groupAvatar from './group_avatar';
 import GroupLabelSubscription from './group_label_subscription';
 import LineHighlighter from './line_highlighter';
-import Project from './project';
-import projectAvatar from './project_avatar';
 import MergeRequest from './merge_request';
 import Compare from './compare';
-import ProjectNew from './project_new';
+import initCompareAutocomplete from './compare_autocomplete';
 import Labels from './labels';
 import LabelManager from './label_manager';
 import Sidebar from './right_sidebar';
@@ -25,19 +23,16 @@ import SecretValues from './behaviors/secret_values';
 import Group from './group';
 import ProjectsList from './projects_list';
 import UserCallout from './user_callout';
-import ShortcutsWiki from './shortcuts_wiki';
 import BlobViewer from './blob/viewer/index';
 import UsersSelect from './users_select';
 import GfmAutoComplete from './gfm_auto_complete';
 import Star from './star';
 import TreeView from './tree';
-import Wikis from './wikis';
 import ZenMode from './zen_mode';
 import initSettingsPanels from './settings_panels';
 import PerformanceBar from './performance_bar';
 import initNotes from './init_notes';
 import initIssuableSidebar from './init_issuable_sidebar';
-import initProjectVisibilitySelector from './project_visibility';
 import NewGroupChild from './groups/new_group_child';
 import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
 import GlFieldErrors from './gl_field_errors';
@@ -54,7 +49,6 @@ import SearchAutocomplete from './search_autocomplete';
 import Activities from './activities';
 
 // EE-only
-import ApproversSelect from 'ee/approvers_select'; // eslint-disable-line import/first
 import initGeoInfoModal from 'ee/init_geo_info_modal'; // eslint-disable-line import/first
 import initGroupAnalytics from 'ee/init_group_analytics'; // eslint-disable-line import/first
 import initPathLocks from 'ee/path_locks'; // eslint-disable-line import/first
@@ -342,7 +336,6 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
           window.mergeRequest = new MergeRequest({
             action: mrShowNode.dataset.mrAction,
           });
-
           shortcut_handler = new ShortcutsIssuable(true);
           break;
         case 'dashboard:activity':
@@ -718,58 +711,37 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
             .catch(fail);
           break;
         case 'projects':
-          new Project();
-          projectAvatar();
+          import('./pages/projects')
+            .then(callDefault)
+            .catch(fail);
+          shortcut_handler = true;
           switch (path[1]) {
             case 'compare':
-              import('./pages/projects/compare')
-                .then(callDefault)
-                .catch(fail);
+              initCompareAutocomplete();
               break;
-            case 'edit':
-              shortcut_handler = new ShortcutsNavigation();
-              new ProjectNew();
-              new ApproversSelect();
-              import(/* webpackChunkName: 'project_permissions' */ './projects/permissions')
+            case 'create':
+            case 'new':
+              import('./pages/projects/new')
                 .then(callDefault)
                 .catch(fail);
               break;
-            case 'new':
-              new ProjectNew();
-              initProjectVisibilitySelector();
-              break;
             case 'show':
               new Star();
-              new ProjectNew();
               notificationsDropdown();
               break;
             case 'wikis':
-              new Wikis();
-              shortcut_handler = new ShortcutsWiki();
-              new ZenMode();
-              new GLForm($('.wiki-form'), true);
+              import('./pages/projects/wikis')
+                .then(callDefault)
+                .catch(fail);
+              shortcut_handler = true;
               break;
             case 'snippets':
-              shortcut_handler = new ShortcutsNavigation();
               if (path[2] === 'show') {
                 new ZenMode();
                 new LineHighlighter();
                 new BlobViewer();
               }
               break;
-            case 'labels':
-            case 'graphs':
-            case 'compare':
-            case 'pipelines':
-            case 'forks':
-            case 'milestones':
-            case 'project_members':
-            case 'deploy_keys':
-            case 'builds':
-            case 'hooks':
-            case 'services':
-            case 'repository':
-              shortcut_handler = new ShortcutsNavigation();
           }
           break;
       }

app/assets/javascripts/pages/projects/edit/index.js

 /* eslint-disable no-new */
-import initSettingsPanels from '~/settings_panels';
-import setupProjectEdit from '~/project_edit';
-
 import UsersSelect from '~/users_select';
 import UserCallout from '~/user_callout';
 import groupsSelect from '~/groups_select';
+import initSettingsPanels from '~/settings_panels';
+import setupProjectEdit from '~/project_edit';
+import ProjectNew from '../shared/project_new';
+import projectAvatar from '../shared/project_avatar';
+import initProjectPermissionsSettings from '../shared/permissions';
+
+// EE imports
+import ApproversSelect from 'ee/approvers_select'; // eslint-disable-line import/first
 
 export default () => {
+  new ProjectNew(); // eslint-disable-line no-new
   new UsersSelect();
   groupsSelect();
   setupProjectEdit();
   // Initialize expandable settings panels
   initSettingsPanels();
+  projectAvatar();
+  initProjectPermissionsSettings();
 
   new UserCallout({ className: 'js-service-desk-callout' });
   new UserCallout({ className: 'js-mr-approval-callout' });
+
+  // EE imports
+  new ApproversSelect(); // eslint-disable-line no-new
 };

app/assets/javascripts/pages/projects/index.js

+import Project from './project';
+import ShortcutsNavigation from '../../shortcuts_navigation';
+
+export default () => {
+  new Project(); // eslint-disable-line no-new
+  new ShortcutsNavigation(); // eslint-disable-line no-new
+};

app/assets/javascripts/pages/projects/new/index.js

+import ProjectNew from '../shared/project_new';
+import initProjectVisibilitySelector from '../../../project_visibility';
+import initProjectNew from '../../../projects/project_new';
+
+export default () => {
+  new ProjectNew(); // eslint-disable-line no-new
+  initProjectVisibilitySelector();
+  initProjectNew.bindEvents();
+};

app/assets/javascripts/project.js → app/assets/javascripts/pages/projects/project.js

 /* eslint-disable func-names, space-before-function-paren, no-var, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
 
 import Cookies from 'js-cookie';
-import { visitUrl } from './lib/utils/url_utility';
-import projectSelect from './project_select';
+import { visitUrl } from '../../lib/utils/url_utility';
+import projectSelect from '../../project_select';
 
 export default class Project {
   constructor() {

app/assets/javascripts/projects/permissions/components/project_feature_setting.vue → app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue

 <script>
-  import projectFeatureToggle from '../../../vue_shared/components/toggle_button.vue';
+  import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue';
 
   export default {
     components: {

app/assets/javascripts/projects/permissions/components/settings_panel.vue → app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

 <script>
   /* eslint-disable vue/require-default-prop */
   import projectFeatureSetting from './project_feature_setting.vue';
-  import projectFeatureToggle from '../../../vue_shared/components/toggle_button.vue';
+  import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue';
   import projectSettingRow from './project_setting_row.vue';
   import { visibilityOptions, visibilityLevelDescriptions } from '../constants';
   import { toggleHiddenClassBySelector } from '../external';

app/assets/javascripts/project_new.js → app/assets/javascripts/pages/projects/shared/project_new.js

 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-unused-vars, one-var, no-underscore-dangle, prefer-template, no-else-return, prefer-arrow-callback, max-len */
 
-import VisibilitySelect from './visibility_select';
+import VisibilitySelect from '../../../visibility_select';
 
 function highlightChanges($elm) {
   $elm.addClass('highlight-changes');

app/assets/javascripts/pages/projects/wikis/index.js

+import Wikis from './wikis';
+import ShortcutsWiki from '../../../shortcuts_wiki';
+import ZenMode from '../../../zen_mode';
+import GLForm from '../../../gl_form';
+
+export default () => {
+  new Wikis(); // eslint-disable-line no-new
+  new ShortcutsWiki(); // eslint-disable-line no-new
+  new ZenMode(); // eslint-disable-line no-new
+  new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
+};

app/assets/javascripts/wikis.js → app/assets/javascripts/pages/projects/wikis/wikis.js

-import bp from './breakpoints';
-import { slugify } from './lib/utils/text_utility';
+import bp from '../../../breakpoints';
+import { slugify } from '../../../lib/utils/text_utility';
 
 export default class Wikis {
   constructor() {

app/assets/javascripts/projects/project_new.js

@@ -106,8 +106,6 @@ const bindEvents = () => {
   });
 };
 
-document.addEventListener('DOMContentLoaded', bindEvents);
-
 export default {
   bindEvents,
   deriveProjectPathFromUrl,

app/assets/javascripts/shortcuts.js

@@ -13,12 +13,10 @@ Mousetrap.stopCallback = (e, element, combo) => {
 };
 
 export default class Shortcuts {
-  constructor(skipResetBindings) {
+  constructor() {
     this.onToggleHelp = this.onToggleHelp.bind(this);
     this.enabledHelp = [];
-    if (!skipResetBindings) {
-      Mousetrap.reset();
-    }
+
     Mousetrap.bind('?', this.onToggleHelp);
     Mousetrap.bind('s', Shortcuts.focusSearch);
     Mousetrap.bind('f', this.focusFilter.bind(this));

app/assets/javascripts/shortcuts_issuable.js

 import Mousetrap from 'mousetrap';
 import _ from 'underscore';
 import Sidebar from './right_sidebar';
-import ShortcutsNavigation from './shortcuts_navigation';
+import Shortcuts from './shortcuts';
 import { CopyAsGFM } from './behaviors/copy_as_gfm';
 
-export default class ShortcutsIssuable extends ShortcutsNavigation {
+export default class ShortcutsIssuable extends Shortcuts {
   constructor(isMergeRequest) {
     super();
 

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js

-import Project from '~/project';
+import Project from '~/pages/projects/project';
 import SmartInterval from '~/smart_interval';
 import Flash from '../flash';
 import {

app/views/projects/new.html.haml

@@ -4,8 +4,6 @@
 - page_title    'New Project'
 - header_title  "Projects", dashboard_projects_path
 - visibility_level = params.dig(:project, :visibility_level) || default_project_visibility
-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'project_new'
 
 .project-edit-container
   .project-edit-errors

config/webpack.config.js

@@ -75,7 +75,6 @@ var config = {
     pipelines_times:      './pipelines/pipelines_times.js',
     profile:              './profile/profile_bundle.js',
     project_import_gl:    './projects/project_import_gitlab_project.js',
-    project_new:          './projects/project_new.js',
     prometheus_metrics:   './prometheus_metrics',
     protected_branches:   './protected_branches',
     ee_protected_branches: 'ee/protected_branches',

spec/javascripts/project_new_spec.js

-import ProjectNew from '~/project_new';
+import ProjectNew from '~/pages/projects/shared/project_new';
 
 describe('ApproversSelect', function () {
   const projectSettingsTemplate = 'projects/edit.html.raw';