Skip to content

fix(settings): chip-consistency + shared credential-style resource row#5308

Merged
waleedlatif1 merged 1 commit into
stagingfrom
worktree-sidebar-chip-hover-parity
Jul 1, 2026
Merged

fix(settings): chip-consistency + shared credential-style resource row#5308
waleedlatif1 merged 1 commit into
stagingfrom
worktree-sidebar-chip-hover-parity

Conversation

@waleedlatif1

@waleedlatif1 waleedlatif1 commented Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • chip: moved the default/filled hover into active-keyed compound variants so each (variant, active) emits exactly one hover-hover:bg-*. Raw chipVariants({...}) consumers now render identically to cn(chipVariants({...})) ones — fixing the sidebar vs settings-sidebar active-hover divergence (selected rows darken on hover consistently). Verified byte-equivalent under tailwind-merge, so cn-wrapped consumers are unchanged.
  • integrations: "Explore in chat" now uses active (was a transparent/floating chip) so it's a filled active chip that darkens on hover.
  • data-retention: folded the "Workspaces without an override inherit the organization defaults" helper out from under the Retention policies section into the page-level description (navigation.ts), dropping the redundant wrapper.
  • settings: extracted a shared SettingsResourceRow (canonical rounded icon tile + title/desc + trailing slot; force-normalizes icons to 20px) and migrated recently-deleted, byok-key-manager, and credential-sets (×3) onto it — eliminating copy-pasted credential-row chrome drift. recently-deleted's Restore/View actions are now Chips (no more non-chip Buttons) and its icon uses the credential-style tile.

Type of Change

  • Bug fix / UI consistency

Testing

Tested manually. tsc clean (0 errors), biome clean across all touched files. No test asserts on chip class strings.

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)

@waleedlatif1
fix(settings): chip-consistency + shared credential-style resource row
8f9aeed 
- chip: move default/filled hover into active-keyed compound variants so raw chipVariants({...}) renders identically to cn(chipVariants({...})); fixes sidebar/settings-sidebar active-hover divergence (no change to cn-wrapped consumers)
- integrations: 'Explore in chat' uses active chip (darkens on hover) instead of floating text
- data-retention: fold the retention-policies helper into the page description; drop the redundant wrapper
- settings: extract shared SettingsResourceRow (rounded icon tile + title/desc + trailing, icons normalized to 20px); migrate recently-deleted, byok, and credential-sets onto it; recently-deleted actions are now Chips
@vercel

vercel Bot commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown

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

Project Deployment Actions Updated (UTC)
docs Ready Ready Preview, Comment Jul 1, 2026 2:09am

Request Review

@cursor

cursor Bot commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown

PR Summary

Low Risk
Presentation-only changes in shared Chip styling and settings UI; no API, auth, or retention logic changes.

Overview
Unifies settings list UI and fixes Chip hover behavior for active / default variants.

Chip (packages/emcn) — Default and filled hover styles move into active-keyed compound variants so each chip gets a single hover-hover:bg-*. Raw chipVariants({...}) callers match cn(chipVariants(...)), fixing inconsistent selected-row hover (e.g. sidebar vs settings). Integrations Explore in chat uses active for a filled, hover-darkening CTA.

Settings — New SettingsResourceRow (icon tile, title, description, trailing slot; icons normalized to 20px). BYOK, credential sets (invitations, memberships, manage), and recently deleted use it instead of duplicated row markup. Recently deleted swaps Button restore/view actions for Chip and bumps list icon sizing to match the tile.

Data retention — The “workspaces without an override inherit org defaults” note moves from the Retention policies section into the Data retention nav subtitle in navigation.ts; the in-section helper text and extra wrapper are removed (list layout unchanged).

Reviewed by Cursor Bugbot for commit 8f9aeed. Configure here.

@greptile-apps

greptile-apps Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR standardizes several settings rows and chip hover states. The main changes are:

  • Moves default and filled chip hover classes into active-aware variants.
  • Marks the integrations Explore chip as active.
  • Adds a shared SettingsResourceRow for BYOK, credential sets, and recently deleted items.
  • Moves the data-retention inheritance note into the settings navigation copy.

Confidence Score: 5/5

This looks safe to merge.

  • No blocking issues found in the changed code.
  • The shared row keeps truncation and trailing actions separated.
  • The chip variant change keeps non-active default and filled hover states covered.

Important Files Changed

Filename Overview
packages/emcn/src/components/chip/chip.tsx Moves default and filled hover styling into active-keyed compound variants while keeping the default chip state covered.
apps/sim/app/workspace/[workspaceId]/settings/components/settings-resource-row/settings-resource-row.tsx Adds a shared resource row with a normalized icon tile, truncating title and description, and an optional trailing slot.
apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok-key-manager.tsx Migrates BYOK provider rows to the shared settings resource row without changing the action rendering path.
apps/sim/app/workspace/[workspaceId]/settings/components/credential-sets/credential-sets.tsx Migrates invitation, membership, and managed credential-set rows to the shared settings resource row.
apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx Migrates deleted-resource rows to the shared resource row and changes restore/view actions from buttons to chips.
apps/sim/ee/data-retention/components/data-retention-settings.tsx Removes the inline inheritance helper text after moving that message to the page-level description.
apps/sim/app/workspace/[workspaceId]/settings/navigation.ts Adds the data-retention inheritance note to the navigation description.
apps/sim/app/workspace/[workspaceId]/integrations/components/showcase-with-explore/showcase-with-explore.tsx Sets the Explore chip to the active visual state.
apps/sim/app/workspace/[workspaceId]/settings/components/settings-resource-row/index.ts Adds the barrel export for the new settings resource row component.

Reviews (1): Last reviewed commit: "fix(settings): chip-consistency + shared..." | Re-trigger Greptile

@waleedlatif1 waleedlatif1 merged commit 0990a17 into staging Jul 1, 2026
17 checks passed
@waleedlatif1 waleedlatif1 deleted the worktree-sidebar-chip-hover-parity branch July 1, 2026 02:17
@waleedlatif1 waleedlatif1 mentioned this pull request Jul 1, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@waleedlatif1