Merge branch '352526-feature-flag-cleanup-invite_members_group_modal5' into 'master'

[Feature flag] Cleanup invite_members_group_modal - remove import

See merge request gitlab-org/gitlab!82821

app/assets/javascripts/member_expiration_date.js

-import $ from 'jquery';
-import Pikaday from 'pikaday';
-import { parsePikadayDate, pikadayToString } from './lib/utils/datetime_utility';
-
-// Add datepickers to all `js-access-expiration-date` elements. If those elements are
-// children of an element with the `clearable-input` class, and have a sibling
-// `js-clear-input` element, then show that element when there is a value in the
-// datepicker, and make clicking on that element clear the field.
-//
-export default function memberExpirationDate(selector = '.js-access-expiration-date') {
-  function toggleClearInput() {
-    $(this)
-      .closest('.clearable-input')
-      .toggleClass('has-value', $(this).val() !== '');
-  }
-  const inputs = $(selector);
-
-  inputs.each((i, el) => {
-    const $input = $(el);
-
-    const calendar = new Pikaday({
-      field: $input.get(0),
-      theme: 'gitlab-theme animate-picker',
-      format: 'yyyy-mm-dd',
-      minDate: new Date(),
-      container: $input.parent().get(0),
-      parse: (dateString) => parsePikadayDate(dateString),
-      toString: (date) => pikadayToString(date),
-      onSelect(dateText) {
-        $input.val(calendar.toString(dateText));
-
-        toggleClearInput.call($input);
-      },
-      firstDay: gon.first_day_of_week,
-    });
-
-    calendar.setDate(parsePikadayDate($input.val()));
-    $input.data('pikaday', calendar);
-  });
-
-  inputs.next('.js-clear-input').on('click', function clicked(event) {
-    event.preventDefault();
-
-    const input = $(this).closest('.clearable-input').find(selector);
-    const calendar = input.data('pikaday');
-
-    calendar.setDate(null);
-    toggleClearInput.call(input);
-  });
-
-  inputs.on('blur', toggleClearInput);
-
-  inputs.each(toggleClearInput);
-}

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

 import { groupMemberRequestFormatter } from '~/groups/members/utils';
-import groupsSelect from '~/groups_select';
 import initInviteGroupTrigger from '~/invite_members/init_invite_group_trigger';
 import initInviteGroupsModal from '~/invite_members/init_invite_groups_modal';
 import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
 import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
 import { s__ } from '~/locale';
-import memberExpirationDate from '~/member_expiration_date';
 import { initMembersApp } from '~/members';
 import { MEMBER_TYPES } from '~/members/constants';
 import { groupLinkRequestFormatter } from '~/members/utils';
-import UsersSelect from '~/users_select';
 
 const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions'];
 
@@ -52,12 +49,7 @@ initMembersApp(document.querySelector('.js-group-members-list-app'), {
   },
 });
 
-groupsSelect();
-memberExpirationDate();
-memberExpirationDate('.js-access-expiration-date-groups');
 initInviteMembersModal();
 initInviteGroupsModal();
 initInviteMembersTrigger();
 initInviteGroupTrigger();
-
-new UsersSelect(); // eslint-disable-line no-new

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

-import groupsSelect from '~/groups_select';
 import initImportAProjectModal from '~/invite_members/init_import_a_project_modal';
 import initInviteGroupTrigger from '~/invite_members/init_invite_group_trigger';
 import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
 import initInviteGroupsModal from '~/invite_members/init_invite_groups_modal';
 import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
 import { s__ } from '~/locale';
-import memberExpirationDate from '~/member_expiration_date';
 import { initMembersApp } from '~/members';
 import { MEMBER_TYPES } from '~/members/constants';
 import { groupLinkRequestFormatter } from '~/members/utils';
 import { projectMemberRequestFormatter } from '~/projects/members/utils';
-import UsersSelect from '~/users_select';
 
-groupsSelect();
-memberExpirationDate();
-memberExpirationDate('.js-access-expiration-date-groups');
 initImportAProjectModal();
 initInviteMembersModal();
 initInviteGroupsModal();
 initInviteMembersTrigger();
 initInviteGroupTrigger();
 
-new UsersSelect(); // eslint-disable-line no-new
-
 const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions'];
 initMembersApp(document.querySelector('.js-project-members-list-app'), {
   [MEMBER_TYPES.user]: {

app/controllers/projects/project_members_controller.rb

@@ -24,23 +24,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     @project_members = present_members(non_invited_members.page(params[:page]))
   end
 
-  def import
-    @projects = Project.visible_to_user_and_access_level(current_user, Gitlab::Access::MAINTAINER).order_id_desc
-  end
-
-  def apply_import
-    source_project = Project.find(params[:source_project_id])
-
-    if can?(current_user, :admin_project_member, source_project)
-      status = @project.team.import(source_project, current_user)
-      notice = status ? "Successfully imported" : "Import failed"
-    else
-      return render_404
-    end
-
-    redirect_to(project_project_members_path(project), notice: notice)
-  end
-
   # MembershipActions concern
   alias_method :membershipable, :project
 

app/views/projects/project_members/import.html.haml

-- page_title _("Import members")
-
-%h3.page-title
-  = _("Import members from another project")
-%p.light
-  = _("Only project members will be imported. Group members will be skipped.")
-%hr
-= form_tag apply_import_project_project_members_path(@project), method: 'post' do
-  .form-group.row
-    = label_tag :source_project_id, _("Project"), class: 'col-form-label col-sm-2'
-    .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
-
-  .form-actions
-    = button_tag _('Import project members'), class: "btn gl-button btn-success"
-    = link_to _("Cancel"), project_project_members_path(@project), class: "btn gl-button btn-cancel"

config/routes/project.rb

@@ -166,11 +166,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         resources :project_members, except: [:show, :new, :create, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do
           collection do
             delete :leave
-
-            # Used for import team
-            # from another project
-            get :import
-            post :apply_import
           end
 
           member do

doc/user/project/members/index.md

@@ -122,11 +122,11 @@ To import users:
 
 1. On the top bar, select **Menu > Projects** and find your project.
 1. On the left sidebar, select **Project information > Members**.
-1. On the **Invite member** tab, at the bottom of the panel, select **Import**.
+1. Select **Import from a project**.
 1. Select the project. You can view only the projects for which you're a maintainer.
 1. Select **Import project members**.
 
-A success message is displayed and the new members are now displayed in the list.
+After the success message displays, refresh the page to view the new members.
 
 ## Inherited membership
 

ee/spec/controllers/projects/project_members_controller_spec.rb

-# frozen_string_literal: true
-
-require('spec_helper')
-
-RSpec.describe Projects::ProjectMembersController do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public, namespace: namespace) }
-  let(:namespace) { create :group }
-
-  describe 'POST apply_import' do
-    subject(:apply_import) do
-      post(:apply_import, params: {
-        namespace_id: project.namespace,
-        project_id: project,
-        source_project_id: another_project.id
-      })
-    end
-
-    let(:another_project) { create(:project, :private) }
-    let(:member) { create(:user) }
-
-    before do
-      project.add_maintainer(user)
-      another_project.add_guest(member)
-      sign_in(user)
-    end
-
-    context 'when user can access source project members' do
-      before do
-        another_project.add_guest(user)
-      end
-
-      context 'and the project group has membership lock enabled' do
-        before do
-          project.namespace.update!(membership_lock: true)
-        end
-
-        it 'responds with 403' do
-          apply_import
-
-          expect(response).to have_gitlab_http_status(:forbidden)
-        end
-      end
-    end
-  end
-
-  describe 'GET import' do
-    subject(:import) do
-      get :import, params: {
-        namespace_id: project.namespace,
-        project_id: project
-      }
-    end
-
-    before do
-      project.add_maintainer(user)
-      sign_in(user)
-    end
-
-    context 'when project group has membership lock enabled' do
-      before do
-        project.namespace.update!(membership_lock: true)
-      end
-
-      it 'responds with 403' do
-        import
-
-        expect(response).to have_gitlab_http_status(:forbidden)
-      end
-    end
-  end
-end

locale/gitlab.pot

@@ -18652,12 +18652,6 @@ msgstr ""
 msgid "Import issues"
 msgstr ""
 
-msgid "Import members"
-msgstr ""
-
-msgid "Import members from another project"
-msgstr ""
-
 msgid "Import multiple repositories by uploading a manifest file."
 msgstr ""
 
@@ -18667,9 +18661,6 @@ msgstr ""
 msgid "Import project from"
 msgstr ""
 
-msgid "Import project members"
-msgstr ""
-
 msgid "Import projects from Bitbucket"
 msgstr ""
 
@@ -25810,9 +25801,6 @@ msgstr ""
 msgid "Only project members can comment."
 msgstr ""
 
-msgid "Only project members will be imported. Group members will be skipped."
-msgstr ""
-
 msgid "Only projects created under a Ultimate license are available in Security Dashboards."
 msgstr ""
 

spec/controllers/projects/project_members_controller_spec.rb

@@ -472,59 +472,6 @@ RSpec.describe Projects::ProjectMembersController do
     end
   end
 
-  describe 'POST apply_import' do
-    let_it_be(:another_project) { create(:project, :private) }
-    let_it_be(:member) { create(:user) }
-
-    before do
-      project.add_maintainer(user)
-      another_project.add_guest(member)
-      sign_in(user)
-    end
-
-    shared_context 'import applied' do
-      before do
-        post(:apply_import, params: {
-                              namespace_id: project.namespace,
-                              project_id: project,
-                              source_project_id: another_project.id
-                            })
-      end
-    end
-
-    context 'when user can admin source project members' do
-      before do
-        another_project.add_maintainer(user)
-      end
-
-      include_context 'import applied'
-
-      it 'imports source project members', :aggregate_failures do
-        expect(project.team_members).to include member
-        expect(controller).to set_flash.to 'Successfully imported'
-        expect(response).to redirect_to(
-          project_project_members_path(project)
-        )
-      end
-    end
-
-    context "when user can't admin source project members" do
-      before do
-        another_project.add_developer(user)
-      end
-
-      include_context 'import applied'
-
-      it 'does not import team members' do
-        expect(project.team_members).not_to include member
-      end
-
-      it 'responds with not found' do
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-  end
-
   describe 'POST resend_invite' do
     let_it_be(:member) { create(:project_member, project: project) }