Skip to content

feat: Show icons for files in Merge Request changes

Paul Slaughter requested to merge ps-mr-changes-1-show-decorators into main

Description

This MR takes a step towards resolving Open changed files when opening MR in Web IDE (gitlab#386256 - closed) by showing an icon next to files that are in the relevant merge request changes.

In the next MR, we'll add behavior for showing the MR diffs.

Screenshots

New Icons New Tooltip New initializing message New initializing message (loading MR part)
Screenshot_2023-03-14_at_12.44.30_AM Screenshot_2023-03-14_at_12.44.47_AM Screenshot_2023-03-14_at_11.22.50_PM Screenshot_2023-03-14_at_8.51.32_AM
New reloading message When loading MR fails
Screenshot_2023-03-14_at_8.51.52_AM Screenshot_2023-03-14_at_8.54.53_AM

How to test?

  1. Start local gdk and find/create a MR with a reasonable amount of changes.
  2. (Optional) Setup an "Access Token" for a user
  3. Start the gitlab-web-ide example app with yarn start:example
  4. Visit http://localhost:8000?mrId=MR_IID where MR_ID should be the iid of the Merge Request you want to open (found in the URL of the Merge Request).
  5. Enter the relevant GitLab URL and Project Path. Keep Git Ref blank.
  6. (Optional) Check the I have a non-production GitLab Token and enter the "Access Token" for the user
  7. Press Start GitLab Web IDE
Edited by Paul Slaughter

Merge request reports