1 files changed, 48 insertions, 62 deletions
diff --git a/app/assets/javascripts/pages/projects/project_members/index.js b/app/assets/javascripts/pages/projects/project_members/index.js
index ed11b07be4a..4aea5614bfb 100644
--- a/app/assets/javascripts/pages/projects/project_members/index.js
+++ b/app/assets/javascripts/pages/projects/project_members/index.js
@@ -1,11 +1,14 @@
 import Vue from 'vue';
-import { deprecatedCreateFlash as flash } from '~/flash';
 import groupsSelect from '~/groups_select';
+import initInviteGroupTrigger from '~/invite_members/init_invite_group_trigger';
+import initInviteMembersForm from '~/invite_members/init_invite_members_form';
 import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
 import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
-import { __ } from '~/locale';
+import { s__ } from '~/locale';
 import memberExpirationDate from '~/member_expiration_date';
-import Members from '~/members';
+import { initMembersApp } from '~/members';
+import { groupLinkRequestFormatter } from '~/members/utils';
+import { projectMemberRequestFormatter } from '~/projects/members/utils';
 import UsersSelect from '~/users_select';
 import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue';
 
@@ -29,68 +32,51 @@ memberExpirationDate('.js-access-expiration-date-groups');
 mountRemoveMemberModal();
 initInviteMembersModal();
 initInviteMembersTrigger();
+initInviteGroupTrigger();
 
-new Members(); // eslint-disable-line no-new
-new UsersSelect(); // eslint-disable-line no-new
+// This is only used when `invite_members_group_modal` feature flag is disabled.
+// This can be removed when `invite_members_group_modal` feature flag is removed.
+initInviteMembersForm();
 
-if (window.gon.features.vueProjectMembersList) {
-  const SHARED_FIELDS = ['account', 'expires', 'maxRole', 'expiration', 'actions'];
+new UsersSelect(); // eslint-disable-line no-new
 
-  Promise.all([
-    import('~/members/index'),
-    import('~/members/utils'),
-    import('~/projects/members/utils'),
-    import('~/locale'),
-  ])
-    .then(
-      ([
-        { initMembersApp },
-        { groupLinkRequestFormatter },
-        { projectMemberRequestFormatter },
-        { s__ },
-      ]) => {
-        initMembersApp(document.querySelector('.js-project-members-list'), {
-          tableFields: SHARED_FIELDS.concat(['source', 'granted']),
-          tableAttrs: { tr: { 'data-qa-selector': 'member_row' } },
-          tableSortableFields: ['account', 'granted', 'maxRole', 'lastSignIn'],
-          requestFormatter: projectMemberRequestFormatter,
-          filteredSearchBar: {
-            show: true,
-            tokens: ['with_inherited_permissions'],
-            searchParam: 'search',
-            placeholder: s__('Members|Filter members'),
-            recentSearchesStorageKey: 'project_members',
-          },
-        });
+const SHARED_FIELDS = ['account', 'expires', 'maxRole', 'expiration', 'actions'];
+initMembersApp(document.querySelector('.js-project-members-list'), {
+  tableFields: SHARED_FIELDS.concat(['source', 'granted']),
+  tableAttrs: { tr: { 'data-qa-selector': 'member_row' } },
+  tableSortableFields: ['account', 'granted', 'maxRole', 'lastSignIn'],
+  requestFormatter: projectMemberRequestFormatter,
+  filteredSearchBar: {
+    show: true,
+    tokens: ['with_inherited_permissions'],
+    searchParam: 'search',
+    placeholder: s__('Members|Filter members'),
+    recentSearchesStorageKey: 'project_members',
+  },
+});
 
-        initMembersApp(document.querySelector('.js-project-group-links-list'), {
-          tableFields: SHARED_FIELDS.concat('granted'),
-          tableAttrs: {
-            table: { 'data-qa-selector': 'groups_list' },
-            tr: { 'data-qa-selector': 'group_row' },
-          },
-          requestFormatter: groupLinkRequestFormatter,
-          filteredSearchBar: {
-            show: true,
-            tokens: [],
-            searchParam: 'search_groups',
-            placeholder: s__('Members|Search groups'),
-            recentSearchesStorageKey: 'project_group_links',
-          },
-        });
+initMembersApp(document.querySelector('.js-project-group-links-list'), {
+  tableFields: SHARED_FIELDS.concat('granted'),
+  tableAttrs: {
+    table: { 'data-qa-selector': 'groups_list' },
+    tr: { 'data-qa-selector': 'group_row' },
+  },
+  requestFormatter: groupLinkRequestFormatter,
+  filteredSearchBar: {
+    show: true,
+    tokens: [],
+    searchParam: 'search_groups',
+    placeholder: s__('Members|Search groups'),
+    recentSearchesStorageKey: 'project_group_links',
+  },
+});
 
-        initMembersApp(document.querySelector('.js-project-invited-members-list'), {
-          tableFields: SHARED_FIELDS.concat('invited'),
-          requestFormatter: projectMemberRequestFormatter,
-        });
+initMembersApp(document.querySelector('.js-project-invited-members-list'), {
+  tableFields: SHARED_FIELDS.concat('invited'),
+  requestFormatter: projectMemberRequestFormatter,
+});
 
-        initMembersApp(document.querySelector('.js-project-access-requests-list'), {
-          tableFields: SHARED_FIELDS.concat('requested'),
-          requestFormatter: projectMemberRequestFormatter,
-        });
-      },
-    )
-    .catch(() => {
-      flash(__('An error occurred while loading the members, please try again.'));
-    });
-}
+initMembersApp(document.querySelector('.js-project-access-requests-list'), {
+  tableFields: SHARED_FIELDS.concat('requested'),
+  requestFormatter: projectMemberRequestFormatter,
+});