Skip to content

fix(env-vars): refactor for workspace/personal env vars to work with server side execution correctly #2197

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.

Sign up for GitHub

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

Merged
icecrasher321 merged 13 commits into from
Dec 5, 2025
Merged

fix(env-vars): refactor for workspace/personal env vars to work with server side execution correctly #2197

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
89fe02b
fix(env-var-resolution): new executor env var resolution changes
icecrasher321 Dec 4, 2025
4679ed3
Merge staging into fix/env-vars-new-exec - resolve skeleton loading c…
icecrasher321 Dec 4, 2025
18dfa39
add sessionuser id"
icecrasher321 Dec 4, 2025
dd73d94
cleanup code
icecrasher321 Dec 4, 2025
2a5b9ae
Merge staging into fix/env-vars-new-exec
icecrasher321 Dec 4, 2025
e836ad2
add doc update
icecrasher321 Dec 4, 2025
7e943ec
fix build
icecrasher321 Dec 4, 2025
f440af7
fix client session pass through"
icecrasher321 Dec 5, 2025
a010ebd
add type change
icecrasher321 Dec 5, 2025
05c9ed8
Merge branch 'staging' into fix/env-vars-new-exec
icecrasher321 Dec 5, 2025
f7dbfd5
Merge branch 'staging' into fix/env-vars-new-exec
icecrasher321 Dec 5, 2025
3a15516
fix env var with hitl
icecrasher321 Dec 5, 2025
02396d5
fix types
icecrasher321 Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge staging into fix/env-vars-new-exec - resolve skeleton loading c… 
…onflict
  • Loading branch information
@icecrasher321
icecrasher321 committed Dec 4, 2025
commit 4679ed3206916abec35eef68110f28c3bd3d9e44
20 changes: 16 additions & 4 deletions ...w/components/sidebar/components-new/settings-modal/components/environment/environment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,12 +505,24 @@ export function EnvironmentVariables({ registerBeforeLeaveHandler }: Environment
{isLoading ? (
<>
<div className='flex flex-col gap-[8px]'>
<Skeleton className='h-[14px] w-[70px]' />
<Skeleton className='h-9 rounded-[6px]' />
<Skeleton className='h-5 w-[70px]' />
<div className='text-[13px] text-[var(--text-muted)]'>
<Skeleton className='h-5 w-[160px]' />
</div>
</div>
<div className='flex flex-col gap-[8px]'>
<Skeleton className='h-[14px] w-[55px]' />
<Skeleton className='h-9 rounded-[6px]' />
<Skeleton className='h-5 w-[55px]' />
{Array.from({ length: 2 }, (_, i) => (
<div key={`personal-${i}`} className={GRID_COLS}>
<Skeleton className='h-9 rounded-[6px]' />
<div />
<Skeleton className='h-9 rounded-[6px]' />
<div className='ml-[8px] flex items-center gap-0'>
<Skeleton className='h-9 w-9 rounded-[6px]' />
<Skeleton className='h-9 w-9 rounded-[6px]' />
</div>
</div>
))}
</div>
</>
) : (
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.