Skip to content

fix(settings): keep organization settings inline without Sim Search - #7862

Merged
TheodoreSpeaks merged 2 commits into
stagingfrom
fix/cred-group-settings
Sep 15, 2026
Merged

TheodoreSpeaks merged 2 commits into
stagingfrom
fix/cred-group-settings

Conversation

@TheodoreSpeaks

@TheodoreSpeaks TheodoreSpeaks commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Show individual organization settings in workspace settings when Sim Search is disabled, with no separate Organization buttons.
  • Make Members available to current organization members on self-hosted deployments and without billing. Keep feature and role restrictions on other settings.
  • Skip billing queries and seat UI when billing is disabled. Preserve the existing Search-enabled layout.

Type of Change

  • Bug fix

Testing

  • 157 focused tests pass, including inline navigation, Search-enabled redirects, membership authorization, and billing-disabled rendering.
  • App type-check, repository lint, all 46 audits, block registry check, and docs manifest check pass.
  • Local app and realtime health checks pass. Visual inspection of authenticated settings requires sign-in.

Checklist

  • Code follows project style guidelines
  • Self-reviewed my changes
  • Tests added/updated and passing
  • No new warnings introduced
  • I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

@vercel

vercel Bot commented Sep 15, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
Project Deployment Actions Updated
docs Skipped Skipped Sep 15, 2026 10:03pm UTC

Request Review

@greptile-apps

greptile-apps Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

RetriggerConfidence Score: 5/5

The PR appears safe to merge; the final diff preserves authorization while correctly separating member-roster availability from billing.

Summary

This PR keeps organization member settings inline when Sim Search is disabled and makes the roster available to current organization members without requiring billing.

  • Preserves server-side workspace and organization membership authorization.
  • Keeps billing settings unavailable when billing is disabled.
  • Prevents organization billing reads and seat UI in billing-disabled deployments.
  • Preserves the existing Search-enabled settings layout.
  • Adds focused coverage for navigation, authorization, and billing-disabled rendering.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Open workspace settings] --> B{Sim Search enabled?}
  B -->|Yes| C[Use existing Search-enabled navigation]
  B -->|No| D{Current host-organization member?}
  D -->|No| E[Hide inline Members entry]
  D -->|Yes| F[Show inline Members entry]
  F --> G[Run workspace and organization authorization]
  G -->|Denied| H[Redirect to General]
  G -->|Allowed| I[Render member roster]
  I --> J{Billing enabled?}
  J -->|Yes| K[Load billing and show seat UI when permitted]
  J -->|No| L[Skip billing reads and seat UI]
Loading

Reviews (3) · Last reviewed commit: "fix(settings): keep organization setting..."

@cubic-dev-ai cubic-dev-ai Bot 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.

No issues found across 12 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@TheodoreSpeaks TheodoreSpeaks changed the title fix(settings): decouple organization access from Sim Search fix(settings): keep organization settings inline without Sim Search Sep 15, 2026
@TheodoreSpeaks

Copy link
Copy Markdown
Collaborator Author

@greptile

@TheodoreSpeaks

Copy link
Copy Markdown
Collaborator Author

@cubic-dev-ai review this PR

@cubic-dev-ai

cubic-dev-ai Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

@cubic-dev-ai review this PR

@TheodoreSpeaks I have started the AI code review. It will take a few minutes to complete.

@cubic-dev-ai cubic-dev-ai Bot 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.

No issues found across 9 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@TheodoreSpeaks

Copy link
Copy Markdown
Collaborator Author

@greptile Please re-review the final PR diff against staging. The saved-link redirect concern describes pre-existing behavior: app/o/[organizationId]/layout.tsx, app/o/[organizationId]/page.tsx, and app/workspace/page.tsx have no diff from the PR base. The existing redirect opens General settings; this PR does not introduce a redirect into another organization's Members page.

The final nine-file diff makes the inline Members entry available based on current organization membership, removes billing-only rendering gates from that section, and disables billing reads/seat UI when billing is off. Workspace and organization membership authorization still run before rendering. Search-enabled navigation remains unchanged. The earlier separate-organization navigation implementation was fully reverted before this revision.

@TheodoreSpeaks

Copy link
Copy Markdown
Collaborator Author

@cubic-dev-ai review this PR

@cubic-dev-ai

cubic-dev-ai Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

@cubic-dev-ai review this PR

@TheodoreSpeaks I have started the AI code review. It will take a few minutes to complete.

@cubic-dev-ai cubic-dev-ai Bot 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.

No issues found across 9 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@TheodoreSpeaks
TheodoreSpeaks merged commit 22c149a into staging Sep 15, 2026
33 of 34 checks passed
@TheodoreSpeaks
TheodoreSpeaks deleted the fix/cred-group-settings branch September 15, 2026 22:30

This branch was previously deployed

1 inactive deployment
Preview 61870855 Deployed Sep 15, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant