-
Notifications
You must be signed in to change notification settings - Fork 3.5k
fix(settings): align skeleton loading states with actual page layouts #3967
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.
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
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 51 additions & 2 deletions
53
apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 42 additions & 18 deletions
60
apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,70 @@ | ||
| import { Skeleton } from '@/components/emcn' | ||
|
|
||
| const GRID_COLS = 'grid grid-cols-[minmax(0,1fr)_8px_minmax(0,1fr)_auto] items-center' | ||
| const GRID_COLS = 'grid grid-cols-[minmax(0,1fr)_8px_minmax(0,1fr)_auto_auto] items-center' | ||
| const COL_SPAN_ALL = 'col-span-5' | ||
|
|
||
| /** | ||
| * Skeleton component for a single secret row in the grid layout. | ||
| * Skeleton for a single integration credential row. | ||
| */ | ||
| export function CredentialSkeleton() { | ||
| return ( | ||
| <div className={GRID_COLS}> | ||
| <div className='flex items-center justify-between gap-3'> | ||
| <div className='flex min-w-0 items-center gap-2.5'> | ||
| <Skeleton className='h-8 w-8 flex-shrink-0 rounded-md' /> | ||
| <div className='flex min-w-0 flex-col justify-center gap-[1px]'> | ||
| <Skeleton className='h-4 w-[120px] rounded' /> | ||
| <Skeleton className='h-3.5 w-[160px] rounded' /> | ||
| </div> | ||
| </div> | ||
| <div className='flex flex-shrink-0 items-center gap-1'> | ||
| <Skeleton className='h-9 w-[60px] rounded-md' /> | ||
| <Skeleton className='h-9 w-[88px] rounded-md' /> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Skeleton for a single secret row matching the credentials grid layout. | ||
| */ | ||
| function CredentialRowSkeleton() { | ||
| return ( | ||
| <div className='contents'> | ||
| <Skeleton className='h-9 rounded-md' /> | ||
| <div /> | ||
| <Skeleton className='h-9 rounded-md' /> | ||
| <div className='ml-2 flex items-center gap-0'> | ||
| <Skeleton className='h-9 w-9 rounded-md' /> | ||
| <Skeleton className='h-9 w-9 rounded-md' /> | ||
| </div> | ||
| <Skeleton className='ml-2 h-9 w-[60px] rounded-md' /> | ||
| <Skeleton className='h-9 w-9 rounded-md' /> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Skeleton for the Secrets section shown during dynamic import loading. | ||
| * Skeleton for the Credentials (Secrets) page shown during dynamic import loading. | ||
| */ | ||
| export function CredentialsSkeleton() { | ||
| return ( | ||
| <div className='flex h-full flex-col gap-4'> | ||
| <div className='flex items-center gap-2'> | ||
| <Skeleton className='h-[30px] flex-1 rounded-lg' /> | ||
| <Skeleton className='h-[30px] w-[56px] rounded-md' /> | ||
| <Skeleton className='h-[30px] w-[50px] rounded-md' /> | ||
| </div> | ||
| <div className='flex flex-col gap-2'> | ||
| <Skeleton className='h-5 w-[70px]' /> | ||
| <div className='text-[var(--text-muted)] text-small'> | ||
| <Skeleton className='h-5 w-[160px]' /> | ||
|
|
||
| <div className='min-h-0 flex-1 overflow-y-auto'> | ||
| <div className='flex flex-col gap-4'> | ||
| <div className={`${GRID_COLS} gap-y-2`}> | ||
| <Skeleton className={`${COL_SPAN_ALL} h-5 w-[70px]`} /> | ||
| <CredentialRowSkeleton /> | ||
| <CredentialRowSkeleton /> | ||
|
|
||
| <div className={`${COL_SPAN_ALL} h-[8px]`} /> | ||
|
|
||
| <Skeleton className={`${COL_SPAN_ALL} h-5 w-[55px]`} /> | ||
| <CredentialRowSkeleton /> | ||
| <CredentialRowSkeleton /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div className='flex flex-col gap-2'> | ||
| <Skeleton className='h-5 w-[55px]' /> | ||
| <CredentialSkeleton /> | ||
| <CredentialSkeleton /> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.