Show Add seats button on admin code suggestions page
What does this MR do and why?
Add Add seats
button to Duo Pro info card on Admin page
Related to https://gitlab.com/gitlab-org/customers-gitlab-com/-/issues/8286
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
How to set up and validate locally
- Login as
root
- Apply the patch - we need to emulate SM with purchased code suggestions addon
8286.patch
diff --git a/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_usage.vue b/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_usage.vue
index fa1b73462817..04982174c07f 100644
--- a/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_usage.vue
+++ b/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_usage.vue
@@ -24,7 +24,7 @@ export default {
inject: { isSaaS: {}, groupId: { default: null } },
data() {
return {
- addOnPurchase: undefined,
+ addOnPurchase: { purchasedQuantity: 2, usedQuantity: 3 },
};
},
computed: {
@@ -59,6 +59,9 @@ export default {
update({ addOnPurchase }) {
return addOnPurchase;
},
+ skip() {
+ return true;
+ },
error(error) {
this.reportError(error);
},
diff --git a/ee/app/controllers/admin/code_suggestions_controller.rb b/ee/app/controllers/admin/code_suggestions_controller.rb
index a801673cf5eb..dcb9f759da18 100644
--- a/ee/app/controllers/admin/code_suggestions_controller.rb
+++ b/ee/app/controllers/admin/code_suggestions_controller.rb
@@ -19,7 +19,8 @@ def index
private
def ensure_feature_available!
- render_404 unless gitlab_sm? && License.current&.paid? && code_suggestions_available?
+ true
+ # render_404 unless gitlab_sm? && License.current&.paid? && code_suggestions_available?
end
end
end
Merge request reports
Activity
assigned to @dzubova
1 Message CHANGELOG missing: If this merge request needs a changelog entry, add the
Changelog
trailer to the commit message you want to add to the changelog.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend @subashis
(UTC-7, 8 hours behind author)
@egrieff
(UTC+1, same timezone as author)
frontend @robyrne
(UTC+0, 1 hour behind author)
@wortschi
(UTC+1, same timezone as author)
Please check reviewer's status!
Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
DangerEdited by Ghost User- Resolved by 🤖 GitLab Bot 🤖
Proper labels assigned to this merge request. Please ignore me.
@dzubova - please see the following guidance and update this merge request.1 Error Please add typebug typefeature, or typemaintenance label to this merge request. Edited by 🤖 GitLab Bot 🤖
Bundle size analysis [beta]
This compares changes in bundle size for entry points between the commits c98d4c60 and 9b53bc78
Special assetsEntrypoint / Name Size before Size after Diff Diff in percent average 4.13 MB 4.13 MB - 0.0 % mainChunk 3.13 MB 3.13 MB - 0.0 %
Note: We do not have exact data for c98d4c60. So we have used data from: 5081e09d.
The intended commit has no webpack pipeline, so we chose the last commit with one before it.Please look at the full report for more details
Read more about how this report works.
Generated by
DangerEdited by Ghost UserE2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for 9b53bc78expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Data Stores | 2 | 0 | 0 | 0 | 2 | ✅ | | Govern | 3 | 0 | 0 | 0 | 3 | ✅ | | Create | 8 | 0 | 3 | 0 | 11 | ✅ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | | Plan | 4 | 0 | 0 | 0 | 4 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 21 | 0 | 4 | 0 | 25 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
e2e-review-qa:
test report for 9b53bc78expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Create | 8 | 0 | 3 | 0 | 11 | ✅ | | Plan | 3 | 0 | 1 | 0 | 4 | ✅ | | Govern | 3 | 0 | 0 | 0 | 3 | ✅ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Data Stores | 2 | 0 | 0 | 0 | 2 | ✅ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 20 | 0 | 5 | 0 | 25 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
Edited by Ghost Useradded groupsubscription management label
added typefeature label
added 608 commits
-
222d0566...2af4896e - 607 commits from branch
master
- 48522582 - Add helper to provide SM link to duo pro
-
222d0566...2af4896e - 607 commits from branch
Quarantined Fulfillment QA E2E Tests
The following Fulfillment QA E2E tests are in quarantine. If your changes would be covered by these tests, please be sure to perform manual testing.
Description Location Fulfillment with an active subscription behaves like Purchase storage adds additional storage to group namespace ./qa/specs/features/ee/browser_ui/11_fulfillment/purchase/purchase_storage_spec.rb[1:2:1:1] Fulfillment with existing compute minutes packs behaves like Purchase storage adds additional storage to group namespace ./qa/specs/features/ee/browser_ui/11_fulfillment/purchase/purchase_storage_spec.rb[1:3:1:1] Fulfillment without active subscription behaves like Purchase storage adds additional storage to group namespace ./qa/specs/features/ee/browser_ui/11_fulfillment/purchase/purchase_storage_spec.rb[1:1:1:1] added 1 commit
- 7d44094e - Don't retun duo_pro_href for no code suggestions
added 353 commits
-
7d44094e...187b4a93 - 351 commits from branch
master
- 82f331ff - Add helper to provide SM link to duo pro
- 6b21d561 - Don't retun duo_pro_href for no code suggestions
-
7d44094e...187b4a93 - 351 commits from branch
changed milestone to %16.9