fix scm history going out of sync after commit (with fixed avatar cac…

…he) (#12837) * fix scm history going out of sync after commit and cache commit avatars Signed-off-by: Carey Williams <[email protected]> Co-authored-by: Erez Odier <[email protected]>
eclipse-theia · Aug 21, 2023 · c483ccb · c483ccb
1 parent 20e3771
commit c483ccb
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/packages/scm-extra/src/browser/history/scm-history-widget.tsx b/packages/scm-extra/src/browser/history/scm-history-widget.tsx
@@ -179,7 +179,6 @@ export class ScmHistoryWidget extends ScmNavigableListWidget<ScmHistoryListNode>
     }
 
     protected async addCommits(options?: HistoryWidgetOptions): Promise<void> {
-        // const repository: Repository | undefined = this.repositoryProvider.findRepositoryOrSelected(options);
         const repository = this.scmService.selectedRepository;
 
         this.cancelIndicator.cancel();
@@ -189,19 +188,17 @@ export class ScmHistoryWidget extends ScmNavigableListWidget<ScmHistoryListNode>
         if (repository) {
             if (this.historySupport) {
                 try {
-                    const currentCommits = this.status.state === 'ready' ? this.status.commits : [];
-
-                    let history = await this.historySupport.getCommitHistory(options);
+                    const history = await this.historySupport.getCommitHistory(options);
                     if (token.isCancellationRequested || !this.hasMoreCommits) {
                         return;
                     }
 
-                    if (options && ((options.maxCount && history.length < options.maxCount) || (!options.maxCount && currentCommits))) {
+                    if (options && (options.maxCount && history.length < options.maxCount)) {
                         this.hasMoreCommits = false;
                     }
-                    if (currentCommits.length > 0) {
-                        history = history.slice(1);
-                    }
+
+                    const avatarCache = new Map<string, string>();
+
                     const commits: ScmCommitNode[] = [];
                     for (const commit of history) {
                         const fileChangeNodes: ScmFileChangeNode[] = [];
@@ -211,7 +208,14 @@ export class ScmHistoryWidget extends ScmNavigableListWidget<ScmHistoryListNode>
                             });
                         }));
 
-                        const avatarUrl = await this.avatarService.getAvatar(commit.authorEmail);
+                        let avatarUrl = '';
+                        if (avatarCache.has(commit.authorEmail)) {
+                            avatarUrl = avatarCache.get(commit.authorEmail)!;
+                        } else {
+                            avatarUrl = await this.avatarService.getAvatar(commit.authorEmail);
+                            avatarCache.set(commit.authorEmail, avatarUrl);
+                        }
+
                         commits.push({
                             commitDetails: commit,
                             authorAvatar: avatarUrl,
@@ -220,8 +224,7 @@ export class ScmHistoryWidget extends ScmNavigableListWidget<ScmHistoryListNode>
                             selected: false
                         });
                     }
-                    currentCommits.push(...commits);
-                    this.status = { state: 'ready', commits: currentCommits };
+                    this.status = { state: 'ready', commits };
                 } catch (error) {
                     if (options && options.uri && repository) {
                         this.hasMoreCommits = false;