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.

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

fix: Allow switching organisations if current one is blocked #4606

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

rolodato
Copy link
Member

@rolodato rolodato commented Sep 9, 2024

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

  • 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

Fixes #4605.

  • Disable checking for blocked org only on /organisations route
  • Improve wording for blocked org; "so we can discuss unblocking your account" sounds like meeting with a mafia boss
  • Add "log out" action item instead of "back to login/signup page" on both SaaS and self-hosted
  • Add action item to switch between orgs
  • Add current blocked org name and ID
  • Replace button elements for links with a
  • Styling tweaks
  • Don't show "manage payment plan" on blocked page, only show it in-app

How did you test this code?

Manually by switching between SaaS/non-SaaS on a dev environment

image
image

@rolodato rolodato requested a review from a team as a code owner September 9, 2024 22:10
@rolodato rolodato requested review from kyle-ssg and removed request for a team September 9, 2024 22:10
Copy link

vercel bot commented Sep 9, 2024

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

Name Status Preview Comments Updated (UTC)
flagsmith-frontend-preview ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 9, 2024 10:10pm
flagsmith-frontend-staging ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 9, 2024 10:10pm
1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
docs ⬜️ Ignored (Inspect) Sep 9, 2024 10:10pm

Copy link
Contributor

github-actions bot commented Sep 9, 2024

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-api-test:pr-4606 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-e2e:pr-4606 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-api:pr-4606 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-private-cloud:pr-4606 Finished ✅ Results
ghcr.io/flagsmith/flagsmith:pr-4606 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-frontend:pr-4606 Finished ✅ Results

@github-actions github-actions bot added the fix label Sep 9, 2024
Copy link
Contributor

github-actions bot commented Sep 9, 2024

Uffizzi Preview deployment-56059 was deleted.

@matthewelwell matthewelwell added this pull request to the merge queue Sep 10, 2024
Merged via the queue into main with commit 6ef774b Sep 10, 2024
31 checks passed
@matthewelwell matthewelwell deleted the feat/switch-org-from-blocked branch September 10, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix front-end Issue related to the React Front End Dashboard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No way to switch organisations if current one is blocked
2 participants