clean up loadStashedFiles

desktop · Apr 11, 2019 · 318e131 · 318e131
1 parent 7ca9301
commit 318e131
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -4816,9 +4816,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _loadStashedFiles(repository: Repository, branchName: string) {
+  public async _loadStashedFiles(
+    repository: Repository,
+    stashEntry: IStashEntry
+  ) {
     const gitStore = this.gitStoreCache.get(repository)
-    await gitStore.loadStashedFiles(branchName)
+    await gitStore.loadStashedFiles(stashEntry)
     this.emitUpdate()
   }
 

diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts
@@ -1003,15 +1003,10 @@ export class GitStore extends BaseStore {
   /**
    * Updates the latest stash entry with a list of files that it changes
    */
-  public async loadStashedFiles(branchName: string) {
-    // get current branch stash entry
-    const stashEntry = this._stashEntries.get(branchName)
-    if (stashEntry === undefined) {
-      return
-    }
+  public async loadStashedFiles(stashEntry: IStashEntry) {
     const files = await getChangedFiles(this.repository, stashEntry.stashSha)
 
-    this._stashEntries.set(branchName, { ...stashEntry, files })
+    this._stashEntries.set(stashEntry.branchName, { ...stashEntry, files })
     this.emitUpdate()
   }
 

diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts
@@ -1961,8 +1961,8 @@ export class Dispatcher {
   }
 
   /** Loads the list of changed files for the latest stash on this branch   */
-  public loadStashedFiles(repository: Repository, branchName: string) {
-    return this.appStore._loadStashedFiles(repository, branchName)
+  public loadStashedFiles(repository: Repository, stashEntry: IStashEntry) {
+    return this.appStore._loadStashedFiles(repository, stashEntry)
   }
 
   /**

diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx
@@ -306,7 +306,7 @@ export class RepositoryView extends React.Component<
         } else if (this.props.state.branchesState.tip.kind === TipState.Valid) {
           this.props.dispatcher.loadStashedFiles(
             this.props.repository,
-            this.props.state.branchesState.tip.branch.name
+            stashEntry
           )
           return null
         }