Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions addons/isl-server/src/Repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import type {
SettableConfigName,
ShelvedChange,
StableInfo,
WorktreeInfo,
Submodule,
SubmodulesByRoot,
UncommittedChanges,
ValidatedRepoInfo,
WorktreeInfo,
} from 'isl/src/types';
import type {Comparison} from 'shared/Comparison';
import type {EjecaChildProcess, EjecaOptions} from 'shared/ejeca';
Expand Down Expand Up @@ -1562,13 +1562,14 @@ export class Repository {
}

public async getWorktrees(ctx: RepositoryContext): Promise<Array<WorktreeInfo>> {
const result = await this.runCommand(
['wt', 'list', '--json'],
'WorktreeListCommand',
ctx,
);
const result = await this.runCommand(['wt', 'list', '--json'], 'WorktreeListCommand', ctx);
try {
return JSON.parse(result.stdout) as Array<WorktreeInfo>;
const worktrees = JSON.parse(result.stdout) as Array<WorktreeInfo>;
// Filter out stale worktrees whose directories no longer exist on disk
const validated = await Promise.all(
worktrees.map(async wt => ({wt, pathExists: await exists(wt.path)})),
);
return validated.filter(({pathExists}) => pathExists).map(({wt}) => wt);
} catch (err) {
ctx.logger.error('Failed to parse worktree list output:', err);
return [];
Expand Down
52 changes: 49 additions & 3 deletions addons/isl/src/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
import type {DetailedHTMLProps} from 'react';

import * as stylex from '@stylexjs/stylex';
import {useAtomValue} from 'jotai';
import {atom, useAtomValue} from 'jotai';
import {colors, radius} from '../../components/theme/tokens.stylex';
import serverAPI from './ClientToServerAPI';
import {allDiffSummaries} from './codeReview/CodeReviewInfo';
import {t} from './i18n';
import {atomFamilyWeak, lazyAtom} from './jotaiUtils';
import {dagWithPreviews} from './previews';

export const avatarUrl = atomFamilyWeak((author: string) => {
// Rate limitor for the same author is by lazyAtom and atomFamilyWeak caching.
Expand All @@ -28,6 +30,34 @@ export const avatarUrl = atomFamilyWeak((author: string) => {
}, undefined);
});

/**
* Shared cache mapping git author strings to GitHub avatar URLs.
* Built by cross-referencing diff summaries (PR data with avatar URLs)
* with the commit DAG (which maps hashes to git author strings).
*/
export const gitAuthorAvatarCache = atom(get => {
const summariesResult = get(allDiffSummaries);
const dag = get(dagWithPreviews);
const cache = new Map<string, string>();

if (!summariesResult?.value) {
return cache;
}

for (const summary of summariesResult.value.values()) {
if (summary.type !== 'github' || !summary.authorAvatarUrl) {
continue;
}
// Match the PR's head commit hash to a DAG commit to get the git author string
const commit = dag.get(summary.head);
if (commit?.author) {
cache.set(commit.author, summary.authorAvatarUrl);
}
}

return cache;
});

export function AvatarImg({
url,
username,
Expand Down Expand Up @@ -162,8 +192,24 @@ export function InitialsAvatar({username, size = 20}: {username: string; size?:
);
}

export function SkeletonAvatar({size = 20}: {size?: number}) {
return (
<div
className="avatar-skeleton"
style={{
width: size,
height: size,
borderRadius: '50%',
flexShrink: 0,
}}
/>
);
}

export function CommitAvatar({username, size = 20}: {username: string; size?: number}) {
const url = useAtomValue(avatarUrl(username));
const fetchedUrl = useAtomValue(avatarUrl(username));
const cachedAvatars = useAtomValue(gitAuthorAvatarCache);
const url = fetchedUrl ?? cachedAvatars.get(username);

if (url) {
return (
Expand All @@ -177,5 +223,5 @@ export function CommitAvatar({username, size = 20}: {username: string; size?: nu
);
}

return <InitialsAvatar username={username} size={size} />;
return <SkeletonAvatar size={size} />;
}
8 changes: 4 additions & 4 deletions addons/isl/src/Commit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {MS_PER_DAY} from 'shared/constants';
import {useAutofocusRef} from 'shared/hooks';
import {notEmpty, nullthrows} from 'shared/utils';
import {spacing} from '../../components/theme/tokens.stylex';
import {AllBookmarksTruncated, Bookmark, Bookmarks, createBookmarkAtCommit} from './Bookmark';
import {CommitAvatar} from './Avatar';
import {AllBookmarksTruncated, Bookmark, Bookmarks, createBookmarkAtCommit} from './Bookmark';
import {openBrowseUrlForHash, supportsBrowseUrlForHash} from './BrowseRepo';
import {hasUnsavedEditedCommitMessage} from './CommitInfoView/CommitInfoState';
import {showComparison} from './ComparisonView/atoms';
Expand All @@ -41,6 +41,7 @@ import {SubmitSingleCommitButton} from './SubmitSingleCommitButton';
import {getSuggestedRebaseOperation, suggestedRebaseDestinations} from './SuggestedRebase';
import {UncommitButton} from './UncommitButton';
import {UncommittedChanges} from './UncommittedChanges';
import {WorktreeIndicator} from './WorktreeIndicator';
import {tracker} from './analytics';
import {clipboardLinkHtml} from './clipboard';
import {
Expand All @@ -50,13 +51,13 @@ import {
diffSummary,
latestCommitMessageTitle,
} from './codeReview/CodeReviewInfo';
import {DiffBadge, DiffFollower, DiffInfo} from './codeReview/DiffBadge';
import {
showOnlyMyStacksAtom,
hideBotStacksAtom,
hideMergedStacksAtom,
isBotAuthor,
showOnlyMyStacksAtom,
} from './codeReview/PRStacksAtom';
import {DiffBadge, DiffFollower, DiffInfo} from './codeReview/DiffBadge';
import {SyncStatus, syncStatusAtom} from './codeReview/syncStatus';
import {useFeatureFlagSync} from './featureFlags';
import {FoldButton, useRunFoldPreview} from './fold';
Expand Down Expand Up @@ -97,7 +98,6 @@ import {latestSuccessorUnlessExplicitlyObsolete} from './successionUtils';
import {copyAndShowToast} from './toast';
import {showModal} from './useModal';
import {short} from './utils';
import {WorktreeIndicator} from './WorktreeIndicator';

export const rebaseOffWarmWarningEnabled = localStorageBackedAtom<boolean>(
'isl.rebase-off-warm-warning-enabled',
Expand Down
94 changes: 72 additions & 22 deletions addons/isl/src/CommitTreeList.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
/* Gradient highlight from left to transparent - visible, extends across most of the row */
background: linear-gradient(
90deg,
rgba(74, 144, 226, 0.20) 0%,
rgba(74, 144, 226, 0.2) 0%,
rgba(74, 144, 226, 0.14) 20%,
rgba(74, 144, 226, 0.08) 45%,
rgba(74, 144, 226, 0.03) 70%,
Expand Down Expand Up @@ -350,11 +350,7 @@

.commit.origin-main-commit .commit-details {
/* Very subtle background tint */
background: linear-gradient(
90deg,
rgba(74, 144, 226, 0.08) 0%,
transparent 50%
);
background: linear-gradient(90deg, rgba(74, 144, 226, 0.08) 0%, transparent 50%);
}

.origin-main-badge {
Expand Down Expand Up @@ -392,18 +388,52 @@
flex-shrink: 0;
}

/* Skeleton avatar placeholder (loading state) */
.avatar-skeleton {
background: linear-gradient(
90deg,
var(--subtle-hover-darken) 0%,
color-mix(in srgb, var(--foreground) 12%, var(--subtle-hover-darken)) 50%,
var(--subtle-hover-darken) 100%
);
background-size: 200% 100%;
animation: avatar-skeleton-pulse 1.5s ease-in-out infinite;
}

@keyframes avatar-skeleton-pulse {
0% {
opacity: 0.3;
}
50% {
opacity: 0.6;
}
100% {
opacity: 0.3;
}
}

/* ===== COMMIT TREE LOADING ===== */

/* Pulsing animation */
@keyframes skeleton-pulse {
0% { opacity: 0.4; }
50% { opacity: 0.7; }
100% { opacity: 0.4; }
0% {
opacity: 0.4;
}
50% {
opacity: 0.7;
}
100% {
opacity: 0.4;
}
}

@keyframes spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

/* Loading container */
Expand Down Expand Up @@ -459,17 +489,37 @@
}

/* Stagger animation delays */
.top-bar-skeleton-left .skeleton-box:nth-child(1) { animation-delay: 0s; }
.top-bar-skeleton-left .skeleton-box:nth-child(2) { animation-delay: 0.1s; }
.top-bar-skeleton-left .skeleton-box:nth-child(3) { animation-delay: 0.2s; }
.top-bar-skeleton-left .skeleton-box:nth-child(4) { animation-delay: 0.3s; }
.top-bar-skeleton-left .skeleton-box:nth-child(5) { animation-delay: 0.4s; }

.top-bar-skeleton-right .skeleton-box:nth-child(1) { animation-delay: 0.15s; }
.top-bar-skeleton-right .skeleton-box:nth-child(2) { animation-delay: 0.25s; }
.top-bar-skeleton-right .skeleton-box:nth-child(3) { animation-delay: 0.35s; }
.top-bar-skeleton-right .skeleton-box:nth-child(4) { animation-delay: 0.45s; }
.top-bar-skeleton-right .skeleton-box:nth-child(5) { animation-delay: 0.55s; }
.top-bar-skeleton-left .skeleton-box:nth-child(1) {
animation-delay: 0s;
}
.top-bar-skeleton-left .skeleton-box:nth-child(2) {
animation-delay: 0.1s;
}
.top-bar-skeleton-left .skeleton-box:nth-child(3) {
animation-delay: 0.2s;
}
.top-bar-skeleton-left .skeleton-box:nth-child(4) {
animation-delay: 0.3s;
}
.top-bar-skeleton-left .skeleton-box:nth-child(5) {
animation-delay: 0.4s;
}

.top-bar-skeleton-right .skeleton-box:nth-child(1) {
animation-delay: 0.15s;
}
.top-bar-skeleton-right .skeleton-box:nth-child(2) {
animation-delay: 0.25s;
}
.top-bar-skeleton-right .skeleton-box:nth-child(3) {
animation-delay: 0.35s;
}
.top-bar-skeleton-right .skeleton-box:nth-child(4) {
animation-delay: 0.45s;
}
.top-bar-skeleton-right .skeleton-box:nth-child(5) {
animation-delay: 0.55s;
}

/* Loading spinner area */
.commit-tree-loading-spinner {
Expand Down
Loading