Migrate branch rule details cards to crud components
What does this MR do and why?
- Migrates
GlCard
toCrudComponent
in rule details page and drawers - Add page header component
- Tweak spacing
Screenshots or screen recordings
Before | After |
---|---|
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
How to set up and validate locally
- Enable
:edit_branch_rules
- Project > Settings > Repository > Branch rules >
View details
(on a branch rule)
Links
Merge request reports
Activity
changed milestone to %17.3
added UX UX Paper Cuts frontend maintenanceusability typemaintenance labels
assigned to @annabeldunstone
added pipelinetier-1 label
1 Warning This merge request contains lines with testid selectors. Please ensure e2e:package-and-test
job is run.1 Message This merge request includes changes to Vue files that have both CE and EE versions. Vue
<template>
in CE and EESome Vue files in CE have a counterpart in EE. (For example,
path/to/file.vue
andee/path/to/file.vue
.)When run in the context of CE, the
<template>
of the CE Vue file is used. When run in the context of EE, the<template>
of the EE Vue file is used.It's easy to accidentally make a change to a CE
<template>
that should appear in both CE and EE without making the change in both places. When this happens, the change only takes effect in CE.The following Vue files were changed as part of this merge request that include both a CE and EE version of the file:
app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
If you made a change to the
<template>
of any of these Vue files that should be visible in both CE and EE, please ensure you have made your change to both versions of the file.A better alternative
An even better alternative is to refactor this component to only use a single template for both CE and EE. More info on this approach here: https://docs.gitlab.com/ee/development/ee_features.html#template-tag
testid
selectorsThe following changed lines in this MR contain
testid
selectors:app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
- data-testid="delete-rule-button" + data-testid="delete-rule-button"
app/assets/javascripts/projects/settings/branch_rules/components/view/protection.vue
- <p v-if="showEmptyState" class="gl-text-secondary" data-testid="protection-empty-state"> + <span v-if="showEmptyState" class="gl-text-subtle" data-testid="protection-empty-state">
app/assets/javascripts/projects/settings/branch_rules/components/view/rule_drawer.vue
- data-testid="save-allowed-to-merge" + data-testid="save-allowed-to-merge"
app/assets/javascripts/projects/settings/components/branch_rule_modal.vue
- <span data-testid="help-text" class="gl-text-secondary"> + <div data-testid="help-text" class="gl-text-subtle gl-mt-2">
app/assets/javascripts/vue_shared/components/list_selector/index.vue
- ><strong data-testid="list-selector-title"
If the
e2e:package-and-test
job in theqa
stage has run automatically, please ensure the tests are passing. If the job has not run, please start themanual:e2e-test-pipeline-generate
job in theprepare
stage and ensure the tests infollow-up:e2e:package-and-test-ee
pipeline are passing.For the list of known failures please refer to the latest pipeline triage issue.
If your changes are under a feature flag, please check our Testing with feature flags documentation for instructions.
Reviewer roulette
Category Reviewer Maintainer frontend @minahilnichols
(UTC-4, 4 hours behind author)
@blabuschagne
(UTC+2, 2 hours ahead of author)
Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Dangeradded 1 commit
- 304007dc - Migrate branch rule details cards to crud components
- Resolved by Annabel Dunstone Gray
@seggenberger Can you please review UX here?
requested review from @seggenberger
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
added 196 commits
-
304007dc...ec517b63 - 195 commits from branch
master
- 8fc9770a - Migrate branch rule details cards to crud components
-
304007dc...ec517b63 - 195 commits from branch
requested review from @seggenberger
mentioned in merge request !161996 (merged)
- Resolved by Annabel Dunstone Gray
added pipeline:mr-approved label
added pipelinetier-2 label and removed pipelinetier-1 label
Before you set this MR to auto-merge
This merge request will progress on pipeline tiers until it reaches the last tier: pipelinetier-3. We will trigger a new pipeline for each transition to a higher tier.
Before you set this MR to auto-merge, please check the following:
- You are the last maintainer of this merge request
- The latest pipeline for this merge request is pipelinetier-3 (You can find which tier it is in the pipeline name)
- This pipeline is recent enough (created in the last 8 hours)
If all the criteria above apply, please set auto-merge for this merge request.
See pipeline tiers and merging a merge request for more details.
removed review request for @seggenberger
E2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for 6b3507fcexpand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Fulfillment | 2 | 0 | 0 | 0 | 2 | ✅ | | Create | 127 | 0 | 12 | 0 | 139 | ✅ | | Data Stores | 31 | 0 | 1 | 0 | 32 | ✅ | | Release | 5 | 0 | 0 | 0 | 5 | ✅ | | Plan | 70 | 0 | 0 | 0 | 70 | ✅ | | Package | 16 | 0 | 15 | 0 | 31 | ✅ | | Govern | 71 | 0 | 0 | 0 | 71 | ✅ | | Monitor | 8 | 0 | 0 | 0 | 8 | ✅ | | Verify | 44 | 0 | 2 | 0 | 46 | ✅ | | Manage | 0 | 0 | 1 | 0 | 1 | ➖ | | Secure | 2 | 0 | 0 | 0 | 2 | ✅ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 378 | 0 | 31 | 0 | 409 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
added 1 commit
- 3ad99765 - Migrate branch rule details cards to crud components
added 1 commit
- 9527d1be - Migrate branch rule details cards to crud components
added 1 commit
- 2f43ed1b - Migrate branch rule details cards to crud components
requested review from @nradina
added 1 commit
- 70b32d73 - Migrate branch rule details cards to crud components
mentioned in merge request !158253 (merged)
- Resolved by Brandon Labuschagne
- Resolved by Brandon Labuschagne
- Resolved by Annabel Dunstone Gray
@annabeldunstone thanks for working on this, changes look good to me!
requested review from @blabuschagne and removed review request for @nradina
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
- Resolved by Annabel Dunstone Gray
added 1 commit
- 6b3507fc - Migrate branch rule details cards to crud components
added pipelinetier-3 pipeline:run-e2e-omnibus-once labels and removed pipelinetier-2 label
started a merge train