Skip to content

fix(navigation): restore organization return from shared workspaces - #8268

Merged
TheodoreSpeaks merged 3 commits into
stagingfrom
codex/fix-organization-back-button
Sep 24, 2026
Merged

TheodoreSpeaks merged 3 commits into
stagingfrom
codex/fix-organization-back-button

Conversation

@TheodoreSpeaks

@TheodoreSpeaks TheodoreSpeaks commented Sep 24, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • Restore organization navigation from shared workspaces, using the viewer's organization independently of workspace ownership.
  • Resolve the destination on the server through the same membership and Search availability checks as the app entry route. Hide both menu entries when no eligible destination exists.
  • Refresh the server layout after organization creation/activation so both destinations update while staying in settings. Propagate activation errors.

Type of Change

  • Bug fix

Testing

  • 70 focused tests passed, covering membership denial, stale active organizations, disabled Search, impersonation, workspace menu navigation, and organization-creation refresh timing.
  • App type-check, full lint check, 49 repository audits, block-registry audit, and docs-manifest check passed.
  • Verified locally that Back to organization opens organization Home with Search available.

Checklist

  • Code follows project style guidelines
  • Self-reviewed my changes
  • Tests added/updated and passing

@vercel

vercel Bot commented Sep 24, 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 24, 2026 9:14pm UTC

Request Review

@greptile-apps

greptile-apps Bot commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerConfidence Score: 5/5

The PR appears safe to merge; no outstanding findings remain.

Summary

The PR resolves organization navigation from the authenticated viewer’s membership and Search availability, then passes the eligible destination to both workspace menus. The follow-up change refreshes the server layout after organization creation and surfaces activation errors.

  • Both menu entries are hidden when no eligible organization destination exists.
  • Focused tests cover destination selection and refresh timing.
Diagram
%%{init: {'theme': 'neutral'}}%%
flowchart LR
  A[Workspace layout] --> B[Resolve viewer organization membership]
  B --> C{Search available?}
  C -->|Yes| D[Organization Home destination]
  C -->|No| E[No destination]
  D --> F[Workspace header and profile menus]
  E --> G[Hide organization entries]
  H[Organization creation settles] --> I[Refresh server layout]
  I --> A
Loading

Reviews (3) · Last reviewed commit: "fix(navigation): refresh organization de..."

Comment thread apps/sim/hooks/use-organization-navigation.ts Outdated

@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 6 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

@TheodoreSpeaks

Copy link
Copy Markdown
Collaborator Author

@cubic-dev-ai review this PR

@cubic-dev-ai

cubic-dev-ai Bot commented Sep 24, 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 7 files

Confidence score: 5/5

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

Re-trigger cubic

Comment thread apps/sim/app/workspace/[workspaceId]/layout.tsx
Comment thread apps/sim/app/workspace/[workspaceId]/layout.tsx
@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 24, 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 f12677b into staging Sep 24, 2026
34 of 35 checks passed
@TheodoreSpeaks
TheodoreSpeaks deleted the codex/fix-organization-back-button branch September 24, 2026 21:25

This branch was previously deployed

1 inactive deployment
Preview — 90e0a3ac Deployed Sep 24, 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