Merge branch 'winh-eslint-promise/no-nesting-project_select.js' into 'master'

Remove nested Promise from project select

See merge request gitlab-org/gitlab!17687

app/assets/javascripts/project_select.js

@@ -5,102 +5,103 @@ import Api from './api';
 import ProjectSelectComboButton from './project_select_combo_button';
 import { s__ } from './locale';
 
-export default function projectSelect() {
-  import(/* webpackChunkName: 'select2' */ 'select2/select2')
-    .then(() => {
-      $('.ajax-project-select').each(function(i, select) {
-        var placeholder;
-        const simpleFilter = $(select).data('simpleFilter') || false;
-        this.groupId = $(select).data('groupId');
-        this.includeGroups = $(select).data('includeGroups');
-        this.allProjects = $(select).data('allProjects') || false;
-        this.orderBy = $(select).data('orderBy') || 'id';
-        this.withIssuesEnabled = $(select).data('withIssuesEnabled');
-        this.withMergeRequestsEnabled = $(select).data('withMergeRequestsEnabled');
-        this.withShared =
-          $(select).data('withShared') === undefined ? true : $(select).data('withShared');
-        this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false;
-        this.allowClear = $(select).data('allowClear') || false;
+const projectSelect = () => {
+  $('.ajax-project-select').each(function(i, select) {
+    var placeholder;
+    const simpleFilter = $(select).data('simpleFilter') || false;
+    this.groupId = $(select).data('groupId');
+    this.includeGroups = $(select).data('includeGroups');
+    this.allProjects = $(select).data('allProjects') || false;
+    this.orderBy = $(select).data('orderBy') || 'id';
+    this.withIssuesEnabled = $(select).data('withIssuesEnabled');
+    this.withMergeRequestsEnabled = $(select).data('withMergeRequestsEnabled');
+    this.withShared =
+      $(select).data('withShared') === undefined ? true : $(select).data('withShared');
+    this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false;
+    this.allowClear = $(select).data('allowClear') || false;
 
-        placeholder = s__('ProjectSelect|Search for project');
-        if (this.includeGroups) {
-          placeholder += s__('ProjectSelect| or group');
-        }
+    placeholder = s__('ProjectSelect|Search for project');
+    if (this.includeGroups) {
+      placeholder += s__('ProjectSelect| or group');
+    }
 
-        $(select).select2({
-          placeholder,
-          minimumInputLength: 0,
-          query: (function(_this) {
-            return function(query) {
-              var finalCallback, projectsCallback;
-              finalCallback = function(projects) {
+    $(select).select2({
+      placeholder,
+      minimumInputLength: 0,
+      query: (function(_this) {
+        return function(query) {
+          var finalCallback, projectsCallback;
+          finalCallback = function(projects) {
+            var data;
+            data = {
+              results: projects,
+            };
+            return query.callback(data);
+          };
+          if (_this.includeGroups) {
+            projectsCallback = function(projects) {
+              var groupsCallback;
+              groupsCallback = function(groups) {
                 var data;
-                data = {
-                  results: projects,
-                };
-                return query.callback(data);
+                data = groups.concat(projects);
+                return finalCallback(data);
               };
-              if (_this.includeGroups) {
-                projectsCallback = function(projects) {
-                  var groupsCallback;
-                  groupsCallback = function(groups) {
-                    var data;
-                    data = groups.concat(projects);
-                    return finalCallback(data);
-                  };
-                  return Api.groups(query.term, {}, groupsCallback);
-                };
-              } else {
-                projectsCallback = finalCallback;
-              }
-              if (_this.groupId) {
-                return Api.groupProjects(
-                  _this.groupId,
-                  query.term,
-                  {
-                    with_issues_enabled: _this.withIssuesEnabled,
-                    with_merge_requests_enabled: _this.withMergeRequestsEnabled,
-                    with_shared: _this.withShared,
-                    include_subgroups: _this.includeProjectsInSubgroups,
-                  },
-                  projectsCallback,
-                );
-              } else {
-                return Api.projects(
-                  query.term,
-                  {
-                    order_by: _this.orderBy,
-                    with_issues_enabled: _this.withIssuesEnabled,
-                    with_merge_requests_enabled: _this.withMergeRequestsEnabled,
-                    membership: !_this.allProjects,
-                  },
-                  projectsCallback,
-                );
-              }
+              return Api.groups(query.term, {}, groupsCallback);
             };
-          })(this),
-          id(project) {
-            if (simpleFilter) return project.id;
-            return JSON.stringify({
-              name: project.name,
-              url: project.web_url,
-            });
-          },
-          text(project) {
-            return project.name_with_namespace || project.name;
-          },
+          } else {
+            projectsCallback = finalCallback;
+          }
+          if (_this.groupId) {
+            return Api.groupProjects(
+              _this.groupId,
+              query.term,
+              {
+                with_issues_enabled: _this.withIssuesEnabled,
+                with_merge_requests_enabled: _this.withMergeRequestsEnabled,
+                with_shared: _this.withShared,
+                include_subgroups: _this.includeProjectsInSubgroups,
+              },
+              projectsCallback,
+            );
+          } else {
+            return Api.projects(
+              query.term,
+              {
+                order_by: _this.orderBy,
+                with_issues_enabled: _this.withIssuesEnabled,
+                with_merge_requests_enabled: _this.withMergeRequestsEnabled,
+                membership: !_this.allProjects,
+              },
+              projectsCallback,
+            );
+          }
+        };
+      })(this),
+      id(project) {
+        if (simpleFilter) return project.id;
+        return JSON.stringify({
+          name: project.name,
+          url: project.web_url,
+        });
+      },
+      text(project) {
+        return project.name_with_namespace || project.name;
+      },
 
-          initSelection(el, callback) {
-            return Api.project(el.val()).then(({ data }) => callback(data));
-          },
+      initSelection(el, callback) {
+        return Api.project(el.val()).then(({ data }) => callback(data));
+      },
 
-          allowClear: this.allowClear,
+      allowClear: this.allowClear,
 
-          dropdownCssClass: 'ajax-project-dropdown',
-        });
-        if (simpleFilter) return select;
-        return new ProjectSelectComboButton(select);
-      });
-    })
+      dropdownCssClass: 'ajax-project-dropdown',
+    });
+    if (simpleFilter) return select;
+    return new ProjectSelectComboButton(select);
+  });
+};
+
+export default () =>
+  import(/* webpackChunkName: 'select2' */ 'select2/select2')
+    .then(projectSelect)
     .catch(() => {});
-}