Refactor delete project button: rename adjourned to delayed in code
requested to merge ali_o_kan/gitlab:339478-project-delete-rename-adjourned-to-delayed-in-code into master
What does this MR do and why?
Related to #339478
During the implementation of delayed group and project deletion, we used various terminology in the documentation and in the codebase. We converged on a single set of terms. We use:
delayed
instead ofadjourned
orsoft-deleted
: #223013 (closed)delete
instead ofremove
: #221100 (closed)
This MR is focusing on frontend "project deletion button".
it changes:
- in
ee/app/views/projects/_remove.html.haml
renames local varsadjourned_deletion
todelayed_deletion
andadjourned_date
todelayed_date
- rename id
#js-project-adjourned-delete-button
to#js-project-delayed-delete-button
- rename
ee/projects/project_adjourned_delete_button.js
toee/projects/project_delayed_delete_button.js
- rename
ee/app/assets/javascripts/projects/components/project_adjourned_delete_button.vue
toee/app/assets/javascripts/projects/components/project_delayed_delete_button.vue
- rename prop
adjournedRemovalDate
todelayedDeletionDate
incomponents/project_delayed_delete_button.vue
- update
ee/spec/frontend/projects/components/project_delayed_delete_button_spec.js
"Visible" changes:
ee/app/views/projects/_remove.html.haml
HTML rendered by -
data-adjourned-removal-date
todata-delayed-removal-date
-
id="js-project-adjourned-delete-button"
toid="js-project-delayed-delete-button"
Before
<!-- END ee/app/views/projects/settings/_marked_for_removal.html.haml -->
<div data-adjourned-removal-date="2022-11-28" data-confirm-phrase="gitlab-org/gitlab-shell" data-forks-count="0" data-form-path="/gitlab-org/gitlab-shell" data-is-fork="" data-issues-count="29" data-merge-requests-count="16" data-restore-help-path="/help/user/project/settings/index#restore-a-project" data-stars-count="0" id="js-project-adjourned-delete-button"></div>
</div>
<!-- END ee/app/views/projects/_remove.html.haml -->
After
<!-- END ee/app/views/projects/settings/_marked_for_removal.html.haml -->
<div data-confirm-phrase="gitlab-org/gitlab-shell" data-delayed-deletion-date="2022-11-28" data-forks-count="0" data-form-path="/gitlab-org/gitlab-shell" data-is-fork="" data-issues-count="29" data-merge-requests-count="16" data-restore-help-path="/help/user/project/settings/index#restore-a-project" data-stars-count="0" id="js-project-delayed-delete-button"></div>
</div>
<!-- END ee/app/views/projects/_remove.html.haml -->
ProjectDelayedDeleteButton Vue component
- component rename
- rename prop
adjournedRemovalDate
todelayedRemovalDate
Before
After
How to set up and validate locally
First of all, "delayed project deletion" has to be enabled:
To enable delayed deletion of projects in a group:
- On the top bar, select Main menu > Groups and find your group.
- On the left sidebar, select Settings > General.
- Expand the Permissions and group features section.
- Scroll to:
- (GitLab 15.1 and later) Deletion protection and select Keep deleted projects.
- (GitLab 15.0 and earlier) Enable delayed project deletion and tick the checkbox.
- Optional. To prevent subgroups from changing this setting, select:
- (GitLab 15.1 and later), Enforce deletion protection for all subgroups
- (GitLab 15.0 and earlier), Enforce for all subgroups.
- Select Save changes.
Then got to Delete a project, in project settings:
- On the top bar, select Main menu > Projects and find your project.
- On the left sidebar, select Settings > General.
- Expand Advanced.
- In the “Delete project” section, select Delete project.
Then, inspect "Delete Project" button with Browser inspector and Vue plugin to see changes.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #339478
Edited by Laurent Deketelaere