Skip to content

feat: consolidate branch actions; allow deleting branch#4263

Merged
markphelps merged 13 commits into
v2from
v2-delete-branch
May 29, 2025
Merged

feat: consolidate branch actions; allow deleting branch#4263
markphelps merged 13 commits into
v2from
v2-delete-branch

Conversation

@markphelps

@markphelps markphelps commented May 29, 2025

Copy link
Copy Markdown
Collaborator
  • Gives the user the ability to delete branched envs
  • Consolidates branch actions and proposal actions into single menu
  • Tries to make it a bit clearer that this is a branched env off of staging in this example

CleanShot 2025-05-29 at 13 28 01@2x
CleanShot 2025-05-29 at 13 27 48@2x

CleanShot 2025-05-29 at 11 32 33@2x

@markphelps
markphelps requested a review from a team as a code owner May 29, 2025 15:35
@dosubot dosubot Bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label May 29, 2025
@markphelps
markphelps requested a review from erka May 29, 2025 15:35
@github-actions

github-actions Bot commented May 29, 2025

Copy link
Copy Markdown
Contributor

The latest Buf updates on your PR. Results from workflow Proto / proto-lint (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed✅ passed✅ passed❌ failed (20)May 29, 2025, 9:12 PM

@codecov

codecov Bot commented May 29, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 4.12371% with 93 lines in your changes missing coverage. Please review.

Please upload report for BASE (v2@30f4909). Learn more about missing BASE report.

Files with missing lines Patch % Lines
internal/server/environments/environments_mock.go 0.00% 25 Missing ⚠️
internal/storage/git/repository.go 0.00% 22 Missing ⚠️
internal/server/environments/storage.go 0.00% 14 Missing ⚠️
...ernal/enterprise/storage/environments/git/store.go 0.00% 12 Missing ⚠️
internal/storage/environments/git/store.go 20.00% 12 Missing ⚠️
internal/server/environments/server.go 0.00% 8 Missing ⚠️
Additional details and impacted files
@@          Coverage Diff          @@
##             v2    #4263   +/-   ##
=====================================
  Coverage      ?   50.65%           
=====================================
  Files         ?      122           
  Lines         ?    13200           
  Branches      ?        0           
=====================================
  Hits          ?     6686           
  Misses        ?     5950           
  Partials      ?      564           
Flag Coverage Δ
unittests 50.65% <4.12%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

* fix: commit listing for changes was backward

Signed-off-by: Mark Phelps <[email protected]>

* fix: fix propose changes too

Signed-off-by: Mark Phelps <[email protected]>

---------

Signed-off-by: Mark Phelps <[email protected]>
@erka

erka commented May 29, 2025

Copy link
Copy Markdown
Contributor

image

We need to adjust input in dark mode as Formik uses own compoment

@dosubot dosubot Bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels May 29, 2025
@markphelps markphelps changed the title feat: add ability to delete branch env feat: consolidate branch actions; allow deleting branch May 29, 2025
@markphelps

Copy link
Copy Markdown
Collaborator Author

CleanShot 2025-05-29 at 13 31 39@2x

@erka how about this?

@erka

erka commented May 29, 2025

Copy link
Copy Markdown
Contributor

@erka how about this?

It looks nice. Formik doesn't validate my input anymore and I can see only error

image

@markphelps

Copy link
Copy Markdown
Collaborator Author

@erka how about this?

It looks nice. Formik doesn't validate my input anymore and I can see only error

image

Ah will fix. And should likely add a UI IT as well

@markphelps

Copy link
Copy Markdown
Collaborator Author

@erka fixed and added ITs

@erka erka left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

Signed-off-by: Mark Phelps <[email protected]>
@markphelps

Copy link
Copy Markdown
Collaborator Author

I also renamed the keys like we talked about

Signed-off-by: Mark Phelps <[email protected]>
@erka erka added the v2 Flipt v2 label May 29, 2025
Signed-off-by: Mark Phelps <[email protected]>
@markphelps
markphelps merged commit 7f85720 into v2 May 29, 2025
@markphelps
markphelps deleted the v2-delete-branch branch May 29, 2025 21:21
@github-project-automation github-project-automation Bot moved this to Done in Flipt V2 May 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL This PR changes 1000+ lines, ignoring generated files. v2 Flipt v2

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants