Skip to content
Snippets Groups Projects

Group usage quotas: Update page hierarchy

Merged Sascha Eggenberger requested to merge group-usage-quotas-page-hierarchy-update into master
All threads resolved!

What does this MR do and why?

Group usage quotas: Update page hierarchy

Updates page hierarchy h1-h3 and migrates some Tailwind classes.

The project usage quotas gets updated with Usage quotas: Update page hierarchy (!176260 - merged)

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

Before After
Seats tab
seats_before seats_after
seats_before_dark seats_after_dark
Pipelines tab
pipelines_before pipelines_after
pipelines_before_dark pipelines_after_dark
Storage tab
storage_before storage_after
storage_before_dark storage_after_dark
Pages tab
pages_before pages_after
pages_before_dark pages_after_dark

How to set up and validate locally

  1. http://gdk.test:3000/groups/flightjs/-/usage_quotas#seats-quota-tab

Related to #499696 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Annabel Dunstone Gray approved this merge request

    approved this merge request

  • 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.

  • Bundle size analysis [beta]

    This compares changes in bundle size for entry points between the commits 43354edb and 763b438b

    :sparkles: Special assets

    Entrypoint / Name Size before Size after Diff Diff in percent
    average 4.42 MB 4.42 MB - 0.0 %
    mainChunk 3.28 MB 3.28 MB - 0.0 %

    Note: We do not have exact data for 43354edb. So we have used data from: 14f61ea6.
    The target commit was too new, so we used the latest commit from master we have info on.
    It might help to rerun the bundle-size-review job
    This might mean that you have a few false positives in this report. If something unrelated to your code changes is reported, you can check this comparison in order to see if they caused this change.

    Please look at the full report for more details


    Read more about how this report works.

    Generated by :no_entry_sign: Danger

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :white_check_mark: test report for 763b438b

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Package     | 25     | 0      | 13      | 0     | 38    | ✅     |
    | Create      | 135    | 0      | 20      | 0     | 155   | ✅     |
    | Verify      | 50     | 0      | 16      | 0     | 66    | ✅     |
    | Govern      | 80     | 0      | 12      | 0     | 92    | ✅     |
    | Monitor     | 8      | 0      | 12      | 0     | 20    | ✅     |
    | Data Stores | 33     | 0      | 10      | 0     | 43    | ✅     |
    | Plan        | 82     | 0      | 8       | 0     | 90    | ✅     |
    | Release     | 5      | 0      | 1       | 0     | 6     | ✅     |
    | Secure      | 4      | 0      | 3       | 0     | 7     | ✅     |
    | Analytics   | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Manage      | 1      | 0      | 9       | 0     | 10    | ✅     |
    | Growth      | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Fulfillment | 2      | 0      | 7       | 0     | 9     | ✅     |
    | Configure   | 0      | 0      | 3       | 0     | 3     | ➖     |
    | Ai-powered  | 0      | 0      | 2       | 0     | 2     | ➖     |
    | ModelOps    | 0      | 0      | 1       | 0     | 1     | ➖     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 427    | 0      | 119     | 0     | 546   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
  • Sascha Eggenberger added 172 commits

    added 172 commits

    Compare with previous version

  • added 1 commit

    • c64ccdb5 - Apply 1 suggestion(s) to 1 file(s)

    Compare with previous version

  • Sascha Eggenberger resolved all threads

    resolved all threads

  • requested review from @aalakkad

  • Ammar Alakkad approved this merge request

    approved this merge request

  • requested review from @timnoah

  • Tim Noah requested changes

    requested changes

  • Sascha Eggenberger added 813 commits

    added 813 commits

    Compare with previous version

  • Sascha Eggenberger requested review from @aalakkad and removed approval

    requested review from @aalakkad and removed approval

  • Sascha Eggenberger requested review from @timnoah

    requested review from @timnoah

  • Ammar Alakkad approved this merge request

    approved this merge request

  • added 1 commit

    • 763b438b - Group usage quotas: Update page hierarchy

    Compare with previous version

  • Sascha Eggenberger removed review request for @timnoah

    removed review request for @timnoah

  • Sascha Eggenberger resolved all threads

    resolved all threads

  • requested review from @fguibert

  • Tim Noah approved this merge request

    approved this merge request

  • Florie Guibert resolved all threads

    resolved all threads

  • Florie Guibert approved this merge request

    approved this merge request

  • Florie Guibert enabled automatic add to merge train when checks pass

    enabled automatic add to merge train when checks pass

  • 2 Warnings
    :warning: This merge request changed files with disabled eslint rules. Please consider fixing them.
    :warning: This merge request contains lines with testid selectors. Please ensure e2e:test-on-omnibus job is run.
    1 Message
    :book: This merge request includes changes to Vue files that have both CE and EE versions.

    Vue <template> in CE and EE

    Some Vue files in CE have a counterpart in EE. (For example, path/to/file.vue and ee/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:

    • ee/app/assets/javascripts/usage_quotas/storage/components/storage_usage_statistics.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

    Disabled eslint rules

    The following files have disabled eslint rules. Please consider fixing them:

    • ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue

    Run the following command for more details

    node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config \
      'ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue'

    testid selectors

    The following changed lines in this MR contain testid selectors:

    app/assets/javascripts/usage_quotas/storage/components/namespace_storage_app.vue

    -    <h3 data-testid="breakdown-subtitle">
    +    <h2 class="gl-heading-2 gl-mb-3 gl-mt-5" data-testid="breakdown-subtitle">

    ee/app/assets/javascripts/usage_quotas/pipelines/components/app.vue

    -    <h3 data-testid="overview-subtitle">{{ __('Pipelines') }}</h3>
    -    <p class="gl-mb-0" data-testid="pipelines-description">
    +    <h2 class="gl-heading-2 gl-my-3" data-testid="overview-subtitle">{{ __('Pipelines') }}</h2>
    +    <p class="gl-mb-0 gl-text-subtle" data-testid="pipelines-description">

    ee/app/assets/javascripts/usage_quotas/seats/components/statistics_seats_card.vue

    -        data-testid="seats-used"
    +      <h2 v-if="shouldRenderSeatsUsedBlock" class="gl-heading-2 gl-mb-3" data-testid="seats-used">
    -        data-testid="seats-owed"
    +      <h2 v-if="shouldRenderSeatsOwedBlock" class="gl-heading-2 gl-mb-0" data-testid="seats-owed">

    ee/app/assets/javascripts/usage_quotas/storage/components/storage_usage_statistics.vue

    -      <h3 data-testid="overview-subtitle">{{ s__('UsageQuota|Namespace overview') }}</h3>
    +      <h2 class="gl-heading-2 gl-my-3" data-testid="overview-subtitle">

    If the e2e:test-on-omnibus job in the qa stage has run automatically, please ensure the tests are passing. If the job has not run, please start the manual:e2e-test-pipeline-generate job in the prepare stage and ensure the tests in follow-up:e2e:test-on-omnibus-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 @aalakkad profile link current availability (UTC+3, 2 hours ahead of author) @mrincon profile link current availability (UTC+1, same timezone as author)
    UX No reviewer available Maintainer review is optional for UX

    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 :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

  • Bundle size analysis [beta]

    This compares changes in bundle size for entry points between the commits b5af2ca4 and 763b438b

    :sparkles: Special assets

    Entrypoint / Name Size before Size after Diff Diff in percent
    average 4.42 MB 4.42 MB - 0.0 %
    mainChunk 3.28 MB 3.28 MB - 0.0 %

    Note: We do not have exact data for b5af2ca4. So we have used data from: 277db8b6.
    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 :no_entry_sign: Danger

  • Florie Guibert mentioned in commit 2c5ed8ea

    mentioned in commit 2c5ed8ea

  • added workflowstaging label and removed workflowcanary label

  • Please register or sign in to reply
    Loading