Add latest changes from gitlab-org/gitlab@master

GitLab Bot · GitLab Bot · commit 13dccdc51d23 · 2025-04-17T03:13:00.000Z
diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -2672,7 +2672,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/models/concerns/ee/issue_available_features.rb'
     - 'ee/app/models/concerns/ee/iteration_eventable.rb'
     - 'ee/app/models/concerns/ee/linkable_item.rb'
-    - 'ee/app/models/concerns/ee/loaded_in_group_list.rb'
     - 'ee/app/models/concerns/ee/mentionable.rb'
     - 'ee/app/models/concerns/ee/mentionable/reference_regexes.rb'
     - 'ee/app/models/concerns/ee/milestoneable.rb'
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-b583acae369d671df2cb8c2a8b6fd42a2351e6bf
+b5461d072019d242cca5f98cf94c56e990d08e7b
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_title.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_title.vue
@@ -6,8 +6,8 @@ import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 export default {
   name: 'PackageTitle',
   components: {
-    TitleArea,
     MetadataItem,
+    TitleArea,
   },
   props: {
     count: {
@@ -19,6 +19,11 @@ export default {
       type: String,
       required: true,
     },
+    isLoading: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     showPackageCount() {
@@ -35,7 +40,7 @@ export default {
 </script>
 
 <template>
-  <title-area :title="$options.i18n.LIST_TITLE_TEXT">
+  <title-area :title="$options.i18n.LIST_TITLE_TEXT" :metadata-loading="isLoading">
     <template #metadata-amount>
       <metadata-item v-if="showPackageCount" icon="package" :text="packageAmountText" />
     </template>
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue
@@ -27,7 +27,7 @@ export default {
   },
   i18n: {
     COPY_COMMIT_SHA: __('Copy commit SHA'),
-    MANUALLY_PUBLISHED: s__('PackageRegistry|Manually Published'),
+    MANUALLY_PUBLISHED: s__('PackageRegistry|Manually published'),
   },
 };
 </script>
@@ -55,7 +55,6 @@ export default {
     </template>
 
     <template v-else>
-      <gl-icon name="upload" class="gl-mr-2" />
       <span data-testid="manually-published">
         {{ $options.i18n.MANUALLY_PUBLISHED }}
       </span>
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue
@@ -238,7 +238,11 @@ export default {
 
 <template>
   <div>
-    <package-title :help-url="$options.links.PACKAGE_HELP_URL" :count="packagesCount">
+    <package-title
+      :help-url="$options.links.PACKAGE_HELP_URL"
+      :count="packagesCount"
+      :is-loading="isLoading"
+    >
       <template v-if="settingsPath" #settings-link>
         <gl-button
           v-gl-tooltip="$options.i18n.settingsText"
@@ -297,7 +301,7 @@ export default {
       <page-size-selector
         v-if="packagesCount"
         :value="pageSize"
-        class="gl-relative gl-right-0 md:gl-absolute"
+        class="gl-relative gl-right-5 md:gl-absolute"
         @input="handlePageSizeChange"
       />
     </div>
diff --git a/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue b/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue
@@ -55,9 +55,8 @@ export default {
     </template>
 
     <template v-else>
-      <gl-icon name="upload" class="gl-mr-2" />
       <span data-testid="manually-published">
-        {{ s__('PackageRegistry|Manually Published') }}
+        {{ s__('PackageRegistry|Manually published') }}
       </span>
     </template>
   </div>
diff --git a/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue b/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue
@@ -96,7 +96,7 @@ export default {
 
 <template>
   <div>
-    <div v-if="!hiddenDelete" class="gl-mb-3 gl-mt-5 gl-flex gl-items-center gl-justify-between">
+    <div v-if="!hiddenDelete" class="gl-my-3 gl-flex gl-items-center gl-justify-between">
       <div class="gl-flex gl-items-center">
         <gl-form-checkbox
           class="gl-ml-2 gl-pt-2"
@@ -107,12 +107,11 @@ export default {
           @change="onChange"
         />
 
-        <p class="gl-mb-0 gl-font-bold">{{ title }}</p>
+        <p class="gl-mb-0">{{ title }}</p>
       </div>
 
       <gl-button
         :disabled="disableDeleteButton"
-        category="secondary"
         variant="danger"
         @click="$emit('delete', selectedItems)"
       >
diff --git a/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue b/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue
@@ -60,16 +60,11 @@ export default {
   <div class="gl-inline-flex gl-items-center">
     <gl-icon v-if="icon" :name="icon" class="gl-mr-3 gl-min-w-5" variant="subtle" />
     <tooltip-on-truncate v-if="link" :title="text" class="gl-truncate" :class="sizeClass">
-      <gl-link :href="link" class="gl-font-bold">
+      <gl-link :href="link">
         {{ text }}
       </gl-link>
     </tooltip-on-truncate>
-    <div
-      v-else
-      data-testid="metadata-item-text"
-      class="gl-inline-flex gl-font-bold"
-      :class="sizeClass"
-    >
+    <div v-else data-testid="metadata-item-text" class="gl-inline-flex" :class="sizeClass">
       <tooltip-on-truncate v-if="!textTooltip" :title="text" class="gl-truncate">
         {{ text }}
       </tooltip-on-truncate>
diff --git a/app/assets/javascripts/vue_shared/components/registry/title_area.vue b/app/assets/javascripts/vue_shared/components/registry/title_area.vue
@@ -64,7 +64,7 @@ export default {
 
 <template>
   <div class="gl-flex gl-flex-col">
-    <page-heading>
+    <page-heading inline-actions>
       <template #heading>
         <slot name="title">{{ title }}</slot>
         <gl-avatar v-if="avatar" :src="avatar" :shape="$options.AVATAR_SHAPE_OPTION_RECT" />
diff --git a/app/models/concerns/loaded_in_group_list.rb b/app/models/concerns/loaded_in_group_list.rb
@@ -16,7 +16,7 @@ def with_counts(archived:)
     end
 
     def with_selects_for_list(archived: nil)
-      with_route.with_counts(archived: archived)
+      with_route.with_counts(archived: archived).preload(:deletion_schedule)
     end
 
     private
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -447,7 +447,7 @@ def group_members_counts
     end
 
     def with_api_scopes
-      preload(:namespace_settings, :group_feature, :parent)
+      preload(:namespace_settings, :group_feature, :parent, :deletion_schedule)
     end
 
     # Handle project creation permissions based on application setting and group setting. The `default_project_creation`
diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb
@@ -70,6 +70,11 @@ class GroupChildEntity < Grape::Entity
     markdown_description
   end
 
+  # For both group and project
+  expose :marked_for_deletion do |instance|
+    instance.self_or_ancestor_marked_for_deletion.present?
+  end
+
   private
 
   def access_group_counts?(group)
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
@@ -62,5 +62,5 @@
 
 - elsif can?(current_user, :remove_group, @group)
   = render 'groups/settings/remove', group: @group, remove_form_id: 'js-remove-group-form'
-  = render_if_exists 'shared/groups_projects/settings/restore', context: @group
+  = render 'shared/groups_projects/settings/restore', context: @group
   = render_if_exists 'groups/settings/immediately_remove', group: @group, remove_form_id: 'js-remove-group-form'
diff --git a/app/views/groups/settings/_delayed_deletion.html.haml b/app/views/groups/settings/_delayed_deletion.html.haml
@@ -0,0 +1,15 @@
+- return if group.marked_for_deletion?
+- remove_form_id = local_assigns.fetch(:remove_form_id, nil)
+- date = permanent_deletion_date_formatted(Date.current)
+
+= render Pajamas::CardComponent.new(body_options: { class: 'gl-bg-feedback-danger' }) do |c|
+  - c.with_header do
+    .gl-flex.gl-grow
+      %h4.gl-text-base.gl-leading-24.gl-m-0.gl-text-feedback-danger= _('Delete group')
+
+  - c.with_body do
+    = form_tag(group, method: :delete, id: remove_form_id) do
+      %p
+        = html_escape(_("This action will place this group, including its subgroups and projects, in a pending deletion state for %{deletion_delayed_period} days, and delete it permanently on %{date}.")) % { date: tag.strong(date), deletion_delayed_period: group.deletion_adjourned_period }
+
+      = render 'groups/settings/remove_button', group: group, remove_form_id: remove_form_id
diff --git a/app/views/groups/settings/_immediately_remove.html.haml b/app/views/groups/settings/_immediately_remove.html.haml
@@ -0,0 +1,18 @@
+- remove_form_id = local_assigns.fetch(:remove_form_id, nil)
+-# FIXME: Replace `Date.current` with `group` after https://gitlab.com/gitlab-org/gitlab/-/work_items/527085
+- date = permanent_deletion_date_formatted(Date.current)
+
+- if group.marked_for_deletion?
+  = render Pajamas::CardComponent.new(body_options: { class: 'gl-bg-feedback-danger' }) do |c|
+    - c.with_header do
+      .gl-flex.gl-grow
+        %h4.gl-text-base.gl-leading-24.gl-m-0.gl-text-feedback-danger= _('Delete group immediately')
+
+    - c.with_body do
+      = form_tag(group, method: :delete, id: remove_form_id) do
+        %p
+          = html_escape(_("This group is scheduled for deletion on %{date}. This action will permanently delete this group, including its subgroups and projects, %{strong_open}immediately%{strong_close}. This action cannot be undone.")) % { date: tag.strong(date), strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
+
+        = hidden_field_tag(:permanently_remove, true)
+
+        = render 'groups/settings/remove_button', group: group, remove_form_id: remove_form_id, button_text: _('Delete group immediately')
diff --git a/app/views/groups/settings/_remove.html.haml b/app/views/groups/settings/_remove.html.haml
@@ -1,6 +1,6 @@
 - remove_form_id = local_assigns.fetch(:remove_form_id, nil)
 
 - if group.adjourned_deletion?
-  = render_if_exists 'groups/settings/delayed_deletion', group: group, remove_form_id: remove_form_id
+  = render 'groups/settings/delayed_deletion', group: group, remove_form_id: remove_form_id
 - else
   = render 'groups/settings/permanent_deletion', group: group, remove_form_id: remove_form_id
diff --git a/doc/api/openapi/openapi_v2.yaml b/doc/api/openapi/openapi_v2.yaml
@@ -43589,6 +43589,8 @@ definitions:
             type: string
           uploads_size:
             type: string
+      marked_for_deletion_on:
+        type: string
       root_storage_statistics:
         "$ref": "#/definitions/API_Entities_Namespace_RootStorageStatistics"
       ldap_cn:
@@ -43601,8 +43603,6 @@ definitions:
         "$ref": "#/definitions/EE_API_Entities_SamlGroupLink"
       file_template_project_id:
         type: string
-      marked_for_deletion_on:
-        type: string
       wiki_access_level:
         type: string
       repository_storage:
@@ -44236,6 +44236,8 @@ definitions:
             type: string
           uploads_size:
             type: string
+      marked_for_deletion_on:
+        type: string
       root_storage_statistics:
         "$ref": "#/definitions/API_Entities_Namespace_RootStorageStatistics"
       ldap_cn:
@@ -44248,8 +44250,6 @@ definitions:
         "$ref": "#/definitions/EE_API_Entities_SamlGroupLink"
       file_template_project_id:
         type: string
-      marked_for_deletion_on:
-        type: string
       wiki_access_level:
         type: string
       repository_storage:
diff --git a/lib/api/entities/group.rb b/lib/api/entities/group.rb
@@ -47,6 +47,10 @@ class Group < BasicGroupDetails
         end
       end
 
+      expose :marked_for_deletion_on, if: ->(group, _) {
+        group.adjourned_deletion?
+      }
+
       expose :root_storage_statistics, using: Entities::Namespace::RootStorageStatistics,
         if: ->(group, opts) {
               expose_root_storage_statistics?(group, opts)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
@@ -43138,7 +43138,7 @@ msgstr ""
 msgid "PackageRegistry|Manage storage used by package assets"
 msgstr ""
 
-msgid "PackageRegistry|Manually Published"
+msgid "PackageRegistry|Manually published"
 msgstr ""
 
 msgid "PackageRegistry|Maven"
diff --git a/spec/frontend/packages_and_registries/shared/components/publish_method_spec.js b/spec/frontend/packages_and_registries/shared/components/publish_method_spec.js
@@ -39,7 +39,7 @@ describe('publish_method', () => {
       expect(findPipelineRef().exists()).toBe(false);
       expect(findPipelineSha().exists()).toBe(false);
       expect(findManualPublish().exists()).toBe(true);
-      expect(findManualPublish().text()).toBe('Manually Published');
+      expect(findManualPublish().text()).toBe('Manually published');
     });
   });
 });
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
@@ -992,6 +992,32 @@ def request
         end
       end
     end
+
+    context 'marked_for_deletion_on attribute' do
+      context 'when the downtier_delayed_deletion feature flag is enabled' do
+        before do
+          stub_feature_flags(downtier_delayed_deletion: true)
+        end
+
+        it 'is exposed' do
+          get api("/groups/#{group1.id}", user1)
+
+          expect(json_response).to have_key 'marked_for_deletion_on'
+        end
+      end
+
+      context 'when the downtier_delayed_deletion feature flag is not enabled' do
+        before do
+          stub_feature_flags(downtier_delayed_deletion: false)
+        end
+
+        it 'is not exposed' do
+          get api("/groups/#{group1.id}", user1)
+
+          expect(json_response).not_to have_key 'marked_for_deletion_on'
+        end
+      end
+    end
   end
 
   describe 'PUT /groups/:id' do
diff --git a/spec/serializers/group_child_entity_spec.rb b/spec/serializers/group_child_entity_spec.rb
@@ -199,4 +199,36 @@
       expect(json[:can_edit]).to eq(false)
     end
   end
+
+  describe 'marked_for_deletion' do
+    let_it_be(:group) { create(:group) }
+    let_it_be(:subgroup) { create(:group, name: 'subgroup', parent: group) }
+    let_it_be(:sub_subgroup) { create(:group, name: 'subsubgroup', parent: subgroup) }
+    let_it_be(:project) { create(:project, name: 'project 1', group: group) }
+
+    before do
+      stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
+      stub_application_setting(deletion_adjourned_period: 14)
+    end
+
+    context 'when group is marked for deletion' do
+      before_all do
+        create(:group_deletion_schedule, group: group, marked_for_deletion_on: Time.zone.today, deleting_user: user)
+      end
+
+      it 'returns true for child projects and groups' do
+        [group, subgroup, sub_subgroup, project].each do |object|
+          expect(described_class.new(object, request: request).as_json[:marked_for_deletion]).to eq(true)
+        end
+      end
+    end
+
+    context 'when group is not marked for deletion' do
+      it 'returns false for child projects and groups' do
+        [group, subgroup, sub_subgroup, project].each do |object|
+          expect(described_class.new(object, request: request).as_json[:marked_for_deletion]).to eq(false)
+        end
+      end
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b583acae369d671df2cb8c2a8b6fd42a2351e6bf`
	`1`	`+b5461d072019d242cca5f98cf94c56e990d08e7b`