Skip to content

Move integration inheritance override dropdown above grid layout

Tom Quirk requested to merge reposition-integration-form-elements into master

What does this MR do?

Final MR for #273269 (closed)

The primary purpose of this MR is to: on the settings form for an integration, move the "override" dropdown section outside (above) the grid layout so that it extends across the full width of the page. To do this, we need to:

  • move grid-related styling from HAML to Vue
  • In Vue, move the override-dropdown placement in the template

Additionally, this MR renames detailed_description to help for Confluence and GitHub integrations. All integrations are now consistent in their use of help to display a notice to the user (see screenshots and !49325 (comment 487444700) for context)

Iteration MR
1. Render help HTML in Vue !49323 (merged)
2. Move integration inheritance dropdown section above grid layout 👉 This MR!

Screenshots (strongly suggested)

Screenshots demonstrate that the UI is consistent across all levels on integration.

Page Before After
Project-level integration Screen_Shot_2021-01-18_at_4.16.34_pm Screen_Shot_2021-01-28_at_6.22.49_pm
Group-level integration Screen_Shot_2021-01-18_at_4.17.13_pm Screen_Shot_2021-01-18_at_3.46.40_pm
Instance-level integration Screen_Shot_2021-01-18_at_4.18.04_pm Screen_Shot_2021-01-18_at_3.47.57_pm
Service template Screen_Shot_2021-01-18_at_4.19.17_pm Screen_Shot_2021-01-18_at_3.51.40_pm

Confluence and GitHub

Confluence and GitHub used to have detailed_descriptions, but with these now renamed as help, this content will appear in the left sidebar. This is consistent with all other integrations (e.g. Jira, above)

Page Before After
GitHub (project level) Screen_Shot_2021-01-28_at_6.17.54_pm Screen_Shot_2021-01-28_at_6.13.41_pm
Confluence (project level) Screen_Shot_2021-01-28_at_6.17.27_pm Screen_Shot_2021-01-28_at_6.15.23_pm
Confluence (group level) Screen_Shot_2021-01-28_at_6.18.22_pm Screen_Shot_2021-01-28_at_6.14.44_pm

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Tom Quirk

Merge request reports