Merge branch 'cngo-sort-issuables' into 'master'

Tidy ~/issuable init functions

See merge request gitlab-org/gitlab!77019

app/assets/javascripts/issuable/bulk_update_sidebar/index.js

+import Vue from 'vue';
+import StatusSelect from './components/status_select.vue';
+import issuableBulkUpdateActions from './issuable_bulk_update_actions';
+import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar';
+
+export function initBulkUpdateSidebar(prefixId) {
+  const el = document.querySelector('.issues-bulk-update');
+
+  if (!el) {
+    return;
+  }
+
+  issuableBulkUpdateActions.init({ prefixId });
+  new IssuableBulkUpdateSidebar(); // eslint-disable-line no-new
+}
+
+export function initIssueStatusSelect() {
+  const el = document.querySelector('.js-issue-status');
+
+  if (!el) {
+    return null;
+  }
+
+  return new Vue({
+    el,
+    render: (createElement) => createElement(StatusSelect),
+  });
+}

app/assets/javascripts/issuable/bulk_update_sidebar/init_issue_status_select.js

-import Vue from 'vue';
-import StatusSelect from './components/status_select.vue';
-
-export default function initIssueStatusSelect() {
-  const el = document.querySelector('.js-issue-status');
-
-  if (!el) {
-    return null;
-  }
-
-  return new Vue({
-    el,
-    render(h) {
-      return h(StatusSelect);
-    },
-  });
-}

app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_sidebar.js

@@ -6,7 +6,6 @@ import { property } from 'lodash';
 import issuableEventHub from '~/issues_list/eventhub';
 import LabelsSelect from '~/labels/labels_select';
 import MilestoneSelect from '~/milestones/milestone_select';
-import initIssueStatusSelect from './init_issue_status_select';
 import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
 import subscriptionSelect from './subscription_select';
 
@@ -57,7 +56,6 @@ export default class IssuableBulkUpdateSidebar {
   initDropdowns() {
     new LabelsSelect();
     new MilestoneSelect();
-    initIssueStatusSelect();
     subscriptionSelect();
 
     if (IS_EE) {

app/assets/javascripts/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar.js

-import issuableBulkUpdateActions from './issuable_bulk_update_actions';
-import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar';
-
-export default {
-  bulkUpdateSidebar: null,
-
-  init(prefixId) {
-    const bulkUpdateEl = document.querySelector('.issues-bulk-update');
-    const alreadyInitialized = Boolean(this.bulkUpdateSidebar);
-
-    if (bulkUpdateEl && !alreadyInitialized) {
-      issuableBulkUpdateActions.init({ prefixId });
-
-      this.bulkUpdateSidebar = new IssuableBulkUpdateSidebar();
-    }
-
-    return this.bulkUpdateSidebar;
-  },
-};

app/assets/javascripts/issuable/index.js

@@ -11,7 +11,9 @@ import IssuableHeaderWarnings from './components/issuable_header_warnings.vue';
 export function initCsvImportExportButtons() {
   const el = document.querySelector('.js-csv-import-export-buttons');
 
-  if (!el) return null;
+  if (!el) {
+    return null;
+  }
 
   const {
     showExportButton,
@@ -42,23 +44,24 @@ export function initCsvImportExportButtons() {
       maxAttachmentSize,
       showLabel,
     },
-    render(h) {
-      return h(CsvImportExportButtons, {
+    render: (createElement) =>
+      createElement(CsvImportExportButtons, {
         props: {
           exportCsvPath,
           issuableCount: parseInt(issuableCount, 10),
         },
-      });
-    },
+      }),
   });
 }
 
 export function initIssuableByEmail() {
-  Vue.use(GlToast);
-
   const el = document.querySelector('.js-issuable-by-email');
 
-  if (!el) return null;
+  if (!el) {
+    return null;
+  }
+
+  Vue.use(GlToast);
 
   const {
     initialEmail,
@@ -79,9 +82,7 @@ export function initIssuableByEmail() {
       markdownHelpPath,
       resetPath,
     },
-    render(h) {
-      return h(IssuableByEmail);
-    },
+    render: (createElement) => createElement(IssuableByEmail),
   });
 }
 
@@ -89,7 +90,7 @@ export function initIssuableHeaderWarnings(store) {
   const el = document.getElementById('js-issuable-header-warnings');
 
   if (!el) {
-    return false;
+    return null;
   }
 
   const { hidden } = el.dataset;
@@ -98,18 +99,18 @@ export function initIssuableHeaderWarnings(store) {
     el,
     store,
     provide: { hidden: parseBoolean(hidden) },
-    render(createElement) {
-      return createElement(IssuableHeaderWarnings);
-    },
+    render: (createElement) => createElement(IssuableHeaderWarnings),
   });
 }
 
 export function initIssuableSidebar() {
-  const sidebarOptEl = document.querySelector('.js-sidebar-options');
+  const el = document.querySelector('.js-sidebar-options');
 
-  if (!sidebarOptEl) return;
+  if (!el) {
+    return;
+  }
 
-  const sidebarOptions = getSidebarOptions(sidebarOptEl);
+  const sidebarOptions = getSidebarOptions(el);
 
   new IssuableContext(sidebarOptions.currentUser); // eslint-disable-line no-new
   Sidebar.initialize();

app/assets/javascripts/issues_list/components/issues_list_app.vue

@@ -517,10 +517,9 @@ export default {
     },
     async handleBulkUpdateClick() {
       if (!this.hasInitBulkEdit) {
-        const initBulkUpdateSidebar = await import(
-          '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar'
-        );
-        initBulkUpdateSidebar.default.init('issuable_');
+        const bulkUpdateSidebar = await import('~/issuable/bulk_update_sidebar');
+        bulkUpdateSidebar.initBulkUpdateSidebar('issuable_');
+        bulkUpdateSidebar.initIssueStatusSelect();
 
         const usersSelect = await import('~/users_select');
         const UsersSelect = usersSelect.default;

app/assets/javascripts/pages/groups/issues/index.js

 import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
-import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
+import { initBulkUpdateSidebar } from '~/issuable/bulk_update_sidebar';
 import { mountIssuablesListApp, mountIssuesListApp } from '~/issues_list';
 import initManualOrdering from '~/issues/manual_ordering';
 import { FILTERED_SEARCH } from '~/filtered_search/constants';
@@ -13,7 +13,7 @@ if (gon.features?.vueIssuesList) {
 
   IssuableFilteredSearchTokenKeys.addExtraTokensForIssues();
   IssuableFilteredSearchTokenKeys.removeTokensForKeys('release');
-  issuableInitBulkUpdateSidebar.init(ISSUE_BULK_UPDATE_PREFIX);
+  initBulkUpdateSidebar(ISSUE_BULK_UPDATE_PREFIX);
 
   initFilteredSearch({
     page: FILTERED_SEARCH.ISSUES,

app/assets/javascripts/pages/groups/merge_requests/index.js

 import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
-import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
+import { initBulkUpdateSidebar } from '~/issuable/bulk_update_sidebar';
 import { FILTERED_SEARCH } from '~/filtered_search/constants';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import projectSelect from '~/project_select';
@@ -8,7 +8,7 @@ import projectSelect from '~/project_select';
 const ISSUABLE_BULK_UPDATE_PREFIX = 'merge_request_';
 
 addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys);
-issuableInitBulkUpdateSidebar.init(ISSUABLE_BULK_UPDATE_PREFIX);
+initBulkUpdateSidebar(ISSUABLE_BULK_UPDATE_PREFIX);
 
 initFilteredSearch({
   page: FILTERED_SEARCH.MERGE_REQUESTS,

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

 import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import { initCsvImportExportButtons, initIssuableByEmail } from '~/issuable';
-import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
+import { initBulkUpdateSidebar, initIssueStatusSelect } from '~/issuable/bulk_update_sidebar';
 import { mountIssuablesListApp, mountIssuesListApp, mountJiraIssuesListApp } from '~/issues_list';
 import initManualOrdering from '~/issues/manual_ordering';
 import { FILTERED_SEARCH } from '~/filtered_search/constants';
@@ -20,7 +20,8 @@ if (gon.features?.vueIssuesList) {
     useDefaultState: true,
   });
 
-  issuableInitBulkUpdateSidebar.init(ISSUABLE_INDEX.ISSUE);
+  initBulkUpdateSidebar(ISSUABLE_INDEX.ISSUE);
+  initIssueStatusSelect();
   new UsersSelect(); // eslint-disable-line no-new
 
   initCsvImportExportButtons();

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

@@ -2,13 +2,14 @@ import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
 import { initCsvImportExportButtons, initIssuableByEmail } from '~/issuable';
-import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
+import { initBulkUpdateSidebar, initIssueStatusSelect } from '~/issuable/bulk_update_sidebar';
 import { FILTERED_SEARCH } from '~/filtered_search/constants';
 import { ISSUABLE_INDEX } from '~/issuable/constants';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import UsersSelect from '~/users_select';
 
-issuableInitBulkUpdateSidebar.init(ISSUABLE_INDEX.MERGE_REQUEST);
+initBulkUpdateSidebar(ISSUABLE_INDEX.MERGE_REQUEST);
+initIssueStatusSelect();
 
 addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys);
 IssuableFilteredSearchTokenKeys.removeTokensForKeys('iteration');

ee/app/assets/javascripts/pages/groups/epics/index/index.js

 import initEpicCreateApp from 'ee/epic/epic_bundle';
 import initEpicsList from 'ee/epics_list/epics_list_bundle';
 import FilteredSearchTokenKeysEpics from 'ee/filtered_search/filtered_search_token_keys_epics';
-import issuableInitBulkUpdateSidebar from '~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar';
+import { initBulkUpdateSidebar } from '~/issuable/bulk_update_sidebar';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 
 const EPIC_BULK_UPDATE_PREFIX = 'epic_';
@@ -21,6 +21,5 @@ if (gon.features.vueEpicsList) {
   });
 
   initEpicCreateApp(true);
-
-  issuableInitBulkUpdateSidebar.init(EPIC_BULK_UPDATE_PREFIX);
+  initBulkUpdateSidebar(EPIC_BULK_UPDATE_PREFIX);
 }