Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: versioned change request change sets #4301

Merged
merged 48 commits into from
Jul 25, 2024
Merged

feat: versioned change request change sets #4301

merged 48 commits into from
Jul 25, 2024

Conversation

kyle-ssg
Copy link
Member

@kyle-ssg kyle-ssg commented Jul 8, 2024 •
edited
Loading

Thanks for submitting a PR! Please check the boxes below:

  • I have run pre-commit to check linting
  • I have added information to docs/ if required so people know about the feature!
  • I have filled in the "Changes" section below?
  • I have filled in the "How did you test this code" section below?
  • I have used a Conventional Commit title for this Pull Request

Changes

Adjusts the way change requests are created in order to prevent versioned change requests from overwriting each other.

How did you test this code?

  • Create a change request with a segment override
  • Create a change request with a remote config update
  • Publish the segment override CR
  • Check the diff of the second CR, it should recognise segment overrides as unchanged
  • Fixes an issue where creating / actioning CRs doesn't update the count

kyle-ssg and others added 19 commits May 29, 2024 15:35
@kyle-ssg
Use single endpoint for versioning
4543e9b
@kyle-ssg
Merge branch 'main' into chore/use-combined-version-endpoint
e98f63b
@kyle-ssg
Strip ids from feature states, remove segment priority calls
f28b6fc
@kyle-ssg
Remove segment overrides
7317930
@kyle-ssg
Merge branch 'refs/heads/main' into chore/use-combined-version-endpoint
eff3f6c 
# Conflicts:
#	frontend/common/services/useFeatureVersion.ts
#	frontend/common/types/requests.ts
@kyle-ssg
Conflicts
c50a56d
@matthewelwell
Merge branch 'refs/heads/main' into chore/use-combined-version-endpoint
a4a3014
@kyle-ssg
Merge branch 'refs/heads/main' into chore/use-combined-version-endpoint
c4a0213
@kyle-ssg
Merge remote-tracking branch 'origin/chore/use-combined-version-endpo…
61cb09f 
…int' into chore/use-combined-version-endpoint
@kyle-ssg
Send change set when creating a change request
08ec717
@kyle-ssg
Merge changesets and feature states
f63bee4
@kyle-ssg
neaten diff change request
badacab
@kyle-ssg
Parse feature states from change request
6f52449
@kyle-ssg
add live_from to changeset
fc72c89
@kyle-ssg
revert project manage widget
0fb492d
@kyle-ssg
Update sidebar on change requests change
582c381
@kyle-ssg
Handle change request with no updates
fb5add1
@kyle-ssg
Merge branch 'refs/heads/main' into feat/versioned-change-request-cha…
7a808e9 
…nge-sets
@kyle-ssg
Revert docker-compose.yml
13a430a
@kyle-ssg kyle-ssg requested a review from a team as a code owner July 8, 2024 17:46
@kyle-ssg kyle-ssg requested review from novakzaballa and removed request for a team July 8, 2024 17:46
@vercel Vercel
Copy link

vercel bot commented Jul 8, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Skipped Deployments
Name Status Preview Comments Updated (UTC)
docs ⬜️ Ignored (Inspect) Visit Preview Jul 25, 2024 8:57am
flagsmith-frontend-preview ⬜️ Ignored (Inspect) Visit Preview Jul 25, 2024 8:57am
flagsmith-frontend-staging ⬜️ Ignored (Inspect) Visit Preview Jul 25, 2024 8:57am

@kyle-ssg kyle-ssg marked this pull request as draft July 8, 2024 17:47
@github-actions github-actions bot added front-end Issue related to the React Front End Dashboard feature New feature or request labels Jul 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 8, 2024 •
edited
Loading

flagsmith-private-cloud image build and security scan finished ✨

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-private-cloud:pr-4301 Finished ✅ Results ✅

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 8, 2024 •
edited
Loading

flagsmith-api image build and security scan finished ✨

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-api:pr-4301 Finished ✅ Results ✅

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 8, 2024 •
edited
Loading

flagsmith-frontend image build and security scan finished ✨

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-frontend:pr-4301 Finished ✅ Results ✅

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 8, 2024 •
edited
Loading

flagsmith image build and security scan finished ✨

Image Build Status Security report
ghcr.io/flagsmith/flagsmith:pr-4301 Finished ✅ Results ✅

@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 24, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 24, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 24, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 24, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 25, 2024
matthewelwell
matthewelwell approved these changes Jul 25, 2024
View reviewed changes
Copy link
Contributor

@matthewelwell matthewelwell left a comment

Choose a reason for hiding this comment

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

I've tested this manually via staging (as that's where the API code is currently) and all looks good to me.

I've added a couple of minor comments on certain aspects of the code, but nothing major.

frontend/common/stores/feature-list-store.ts Show resolved Hide resolved
frontend/web/components/ErrorMessage.js Outdated Show resolved Hide resolved
kyle-ssg added 2 commits July 25, 2024 09:56
@kyle-ssg
remove log
978bf13
@kyle-ssg
Merge remote-tracking branch 'origin/feat/versioned-change-request-ch…
027df2c 
…ange-sets' into feat/versioned-change-request-change-sets
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 25, 2024
@matthewelwell matthewelwell added this pull request to the merge queue Jul 25, 2024
Merged via the queue into main with commit 6f1f212 Jul 25, 2024
30 checks passed
@matthewelwell matthewelwell deleted the feat/versioned-change-request-change-sets branch July 25, 2024 09:14
@flagsmithdev flagsmithdev mentioned this pull request Jul 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewelwell matthewelwell matthewelwell approved these changes

@novakzaballa novakzaballa Awaiting requested review from novakzaballa novakzaballa is a code owner automatically assigned from Flagsmith/flagsmith-front-end

Assignees
No one assigned
Labels
api Issue related to the REST API feature New feature or request front-end Issue related to the React Front End Dashboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Warn when creating empty change requests Prevent versioned change requests from overwriting each other
2 participants
@kyle-ssg @matthewelwell