Merge branch...

Merge branch '264262-users-who-have-reached-their-personal-project-limit-cannot-fork-to-group' into 'master'

Allow users to fork to a group when their personal namespace is full

See merge request gitlab-org/gitlab!53632

app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue

@@ -14,10 +14,6 @@ export default {
     ForkGroupsListItem,
   },
   props: {
-    hasReachedProjectLimit: {
-      type: Boolean,
-      required: true,
-    },
     endpoint: {
       type: String,
       required: true,
@@ -77,7 +73,6 @@ export default {
           v-for="(namespace, index) in filteredNamespaces"
           :key="index"
           :group="namespace"
-          :has-reached-project-limit="hasReachedProjectLimit"
         />
       </ul>
     </gl-tab>

app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue

@@ -10,7 +10,6 @@ import {
   GlSafeHtmlDirective as SafeHtml,
 } from '@gitlab/ui';
 import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '~/groups/constants';
-import { __ } from '~/locale';
 import csrf from '~/lib/utils/csrf';
 
 export default {
@@ -31,10 +30,6 @@ export default {
       type: Object,
       required: true,
     },
-    hasReachedProjectLimit: {
-      type: Boolean,
-      required: true,
-    },
   },
   data() {
     return { namespaces: null, isForking: false };
@@ -60,12 +55,7 @@ export default {
       return GROUP_VISIBILITY_TYPE[this.group.visibility];
     },
     isSelectButtonDisabled() {
-      return this.hasReachedProjectLimit || !this.group.can_create_project;
-    },
-    selectButtonDisabledTooltip() {
-      return this.hasReachedProjectLimit
-        ? this.$options.i18n.hasReachedProjectLimitMessage
-        : this.$options.i18n.insufficientPermissionsMessage;
+      return !this.group.can_create_project;
     },
   },
 
@@ -76,13 +66,6 @@ export default {
     },
   },
 
-  i18n: {
-    hasReachedProjectLimitMessage: __('You have reached your project limit'),
-    insufficientPermissionsMessage: __(
-      'You must have permission to create a project in a namespace before forking.',
-    ),
-  },
-
   csrf,
 };
 </script>
@@ -149,7 +132,9 @@ export default {
               </form>
             </div>
             <gl-tooltip v-if="isSelectButtonDisabled" :target="() => $refs.selectButtonWrapper">
-              {{ selectButtonDisabledTooltip }}
+              {{
+                __('You must have permission to create a project in a namespace before forking.')
+              }}
             </gl-tooltip>
           </template>
         </div>

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

 import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
 import ForkGroupsList from './components/fork_groups_list.vue';
 
 document.addEventListener('DOMContentLoaded', () => {
   const mountElement = document.getElementById('fork-groups-mount-element');
 
-  const { endpoint, canCreateProject } = mountElement.dataset;
-
-  const hasReachedProjectLimit = !parseBoolean(canCreateProject);
+  const { endpoint } = mountElement.dataset;
 
   return new Vue({
     el: mountElement,
@@ -15,7 +12,6 @@ document.addEventListener('DOMContentLoaded', () => {
       return h(ForkGroupsList, {
         props: {
           endpoint,
-          hasReachedProjectLimit,
         },
       });
     },

app/views/projects/forks/new.html.haml

@@ -14,5 +14,5 @@
         %h5.gl-mt-0.gl-mb-0.gl-ml-3.gl-mr-3
           = _("Select a namespace to fork the project")
         = render 'fork_button', namespace: @own_namespace
-    #fork-groups-mount-element{ data: { endpoint: new_project_fork_path(@project, format: :json), can_create_project: current_user.can_create_project?.to_s } }
+    #fork-groups-mount-element{ data: { endpoint: new_project_fork_path(@project, format: :json) } }
 

changelogs/unreleased/264262-users-who-have-reached-their-personal-project-limit-cannot-fork-to.yml

+---
+title: Allow users to fork to a group when their personal namespace is full
+merge_request: 53632
+author:
+type: fixed

spec/features/projects/fork_spec.rb

@@ -9,24 +9,47 @@ RSpec.describe 'Project fork' do
   let(:project) { create(:project, :public, :repository) }
 
   before do
-    sign_in user
+    sign_in(user)
   end
 
-  it 'allows user to fork project' do
+  it 'allows user to fork project from the project page' do
     visit project_path(project)
 
-    expect(page).not_to have_css('a.disabled', text: 'Select')
+    expect(page).not_to have_css('a.disabled', text: 'Fork')
   end
 
-  it 'disables fork button when user has exceeded project limit' do
-    user.projects_limit = 0
-    user.save!
+  context 'user has exceeded personal project limit' do
+    before do
+      user.update!(projects_limit: 0)
+    end
 
+    it 'disables fork button on project page' do
       visit project_path(project)
 
       expect(page).to have_css('a.disabled', text: 'Fork')
     end
 
+    context 'with a group to fork to' do
+      let!(:group) { create(:group).tap { |group| group.add_owner(user) } }
+
+      it 'enables fork button on project page' do
+        visit project_path(project)
+
+        expect(page).not_to have_css('a.disabled', text: 'Fork')
+      end
+
+      it 'allows user to fork only to the group on fork page', :js do
+        visit new_project_fork_path(project)
+
+        to_personal_namespace = find('[data-qa-selector=fork_namespace_button].disabled')
+        to_group = find(".fork-groups button[data-qa-name=#{group.name}]")
+
+        expect(to_personal_namespace).not_to be_nil
+        expect(to_group).not_to be_disabled
+      end
+    end
+  end
+
   context 'forking enabled / disabled in project settings' do
     before do
       project.project_feature.update_attribute(

spec/frontend/pages/projects/forks/new/components/fork_groups_list_item_spec.js

@@ -5,10 +5,6 @@ import ForkGroupsListItem from '~/pages/projects/forks/new/components/fork_group
 describe('Fork groups list item component', () => {
   let wrapper;
 
-  const DEFAULT_PROPS = {
-    hasReachedProjectLimit: false,
-  };
-
   const DEFAULT_GROUP_DATA = {
     id: 22,
     name: 'Gitlab Org',
@@ -33,7 +29,6 @@ describe('Fork groups list item component', () => {
   const createWrapper = (propsData) => {
     wrapper = shallowMount(ForkGroupsListItem, {
       propsData: {
-        ...DEFAULT_PROPS,
         ...propsData,
       },
     });

spec/frontend/pages/projects/forks/new/components/fork_groups_list_spec.js

@@ -16,7 +16,6 @@ describe('Fork groups list component', () => {
 
   const DEFAULT_PROPS = {
     endpoint: '/dummy',
-    hasReachedProjectLimit: false,
   };
 
   const replyWith = (...args) => axiosMock.onGet(DEFAULT_PROPS.endpoint).reply(...args);
@@ -94,10 +93,9 @@ describe('Fork groups list component', () => {
 
   it('renders list items for each available group', async () => {
     const namespaces = [{ name: 'dummy1' }, { name: 'dummy2' }, { name: 'otherdummy' }];
-    const hasReachedProjectLimit = true;
 
     replyWith(200, { namespaces });
-    createWrapper({ hasReachedProjectLimit });
+    createWrapper();
 
     await waitForPromises();
 
@@ -106,7 +104,6 @@ describe('Fork groups list component', () => {
     namespaces.forEach((namespace, idx) => {
       expect(wrapper.findAll(ForkGroupsListItem).at(idx).props()).toStrictEqual({
         group: namespace,
-        hasReachedProjectLimit,
       });
     });
   });