Skip to content

fix(settings): seed the server deployment shape on organization and standalone settings surfaces - #7849

Merged
waleedlatif1 merged 3 commits into
stagingfrom
fix/org-view-deployment-shape
Sep 15, 2026
Merged

waleedlatif1 merged 3 commits into
stagingfrom
fix/org-view-deployment-shape

Conversation

@waleedlatif1

@waleedlatif1 waleedlatif1 commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • The organization surface (/o/[organizationId]/...) and the standalone account and self-host settings pages never seeded the server-resolved deployment shape. Their client code fell back to the frozen NEXT_PUBLIC_* env constants
  • When that transport loads after module init, the fallback resolves Sim Cloud as self-hosted with billing off, so enterprise features default off. In the organization view the SSO page loses its Provisioning (SCIM) tab, while the same page inside a workspace shows it. Standalone settings could likewise hide Billing or Chat keys
  • OrganizationSurfaceContext now carries the deployment shape it already resolves on the server, the same way WorkspaceHostContext does, and OrganizationProvider seeds it before any child renders. It also reads chatEnabled from it
  • The standalone settings layouts pass resolveDeploymentShape() to StandaloneSettingsShell, which seeds it before reading the shape
  • Moved the seeding hook to hooks/use-seed-deployment-shape.ts so all three surfaces share it
  • Updated the deployment-flag guidance in the agent rules

Type of Change

  • Bug fix

Testing

  • New tests:
    • organization children read the server shape (including features.scim) on first render
    • the standalone shell filters Billing and Chat keys by the server shape
    • both fail with seeding removed
  • Organization surface, workspace provider, surface context, settings and deployment-shape suites pass
  • lint, check:audits, docs-manifest:check and repo-wide type-check pass

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.

Project Deployment Actions Updated
docs Ready Ready Preview Sep 15, 2026 3:23am 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 changed surfaces consistently seed the same server-resolved deployment configuration before dependent UI renders.

Summary

The PR ensures organization and standalone settings surfaces initialize the browser deployment-shape reader from server-resolved configuration before deployment-dependent children render.

  • Adds the deployment shape to the organization surface context and seeds it in OrganizationProvider.
  • Reuses a shared seeding hook across organization, workspace, and standalone settings providers.
  • Seeds account and self-host settings shells before filtering deployment-dependent navigation.
  • Adds first-render coverage for SCIM, chat, billing, and hosted feature gates.
  • Updates repository guidance to cover all seeded surfaces.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart LR
  E[Server deployment configuration] --> R[resolveDeploymentShape]
  R --> O[Organization surface context]
  R --> S[Standalone settings layouts]
  W[Workspace host context] --> H[useSeedDeploymentShape]
  O --> H
  S --> H
  H --> Z[Browser deployment-shape store]
  Z --> C[Organization and settings children]
  Z --> N[Deployment-dependent navigation and feature gates]
Loading

Reviews (2) · Last reviewed commit: "improvement(settings): carry the deploym..."

@waleedlatif1 waleedlatif1 changed the title fix(organizations): seed the server deployment shape on the organization surface fix(settings): seed the server deployment shape on organization and standalone settings surfaces Sep 15, 2026
@waleedlatif1

Copy link
Copy Markdown
Collaborator Author

@greptile

@waleedlatif1

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

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

@waleedlatif1
waleedlatif1 merged commit a900c0d into staging Sep 15, 2026
25 of 26 checks passed
@waleedlatif1
waleedlatif1 deleted the fix/org-view-deployment-shape branch September 15, 2026 03:24
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