fix getting the previous preview

kactus-io · Aug 4, 2017 · ae0944f · ae0944f
1 parent 318415e
commit ae0944f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/app/src/lib/dispatcher/app-store.ts b/app/src/lib/dispatcher/app-store.ts
@@ -102,6 +102,23 @@ import { IGitAccount } from '../git/authentication'
 import { getGenericHostname, getGenericUsername } from '../generic-git-auth'
 import { RetryActionType, RetryAction } from '../retry-actions'
 
+function findNext(
+  array: ReadonlyArray<string>,
+  toFind: string
+): string | undefined {
+  let found = false
+  return array.find((s, i) => {
+    if (s === toFind) {
+      found = true
+      return false
+    }
+    if (found) {
+      return true
+    }
+    return false
+  })
+}
+
 const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
 
 const defaultSidebarWidth: number = 250
@@ -732,12 +749,15 @@ export class AppStore {
       }
     }
 
+    const previousSha = findNext(stateBeforeLoad.historyState.history, sha)
+
     const diff = await getCommitDiff(
       this.sketchPath,
       repository,
       stateBeforeLoad.kactus.files,
       file,
-      sha
+      sha,
+      previousSha
     )
 
     const stateAfterLoad = this.getRepositoryState(repository)
@@ -1228,7 +1248,8 @@ export class AppStore {
       this.sketchPath,
       repository,
       stateBeforeLoad.kactus.files,
-      selectedFileBeforeLoad
+      selectedFileBeforeLoad,
+      stateBeforeLoad.historyState.history[0]
     )
 
     const stateAfterLoad = this.getRepositoryState(repository)

diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts
@@ -67,7 +67,8 @@ export async function getCommitDiff(
   repository: Repository,
   kactusFiles: Array<IKactusFile>,
   file: FileChange,
-  commitish: string
+  commitish: string,
+  previousCommitish?: string
 ): Promise<IDiff> {
   const args = [
     'log',
@@ -98,7 +99,8 @@ export async function getCommitDiff(
     kactusFiles,
     file,
     diffText,
-    commitish
+    commitish,
+    previousCommitish
   )
 }
 
@@ -111,7 +113,8 @@ export async function getWorkingDirectoryDiff(
   sketchPath: string,
   repository: Repository,
   kactusFiles: Array<IKactusFile>,
-  file: WorkingDirectoryFileChange
+  file: WorkingDirectoryFileChange,
+  previousCommitish?: string
 ): Promise<IDiff> {
   let successExitCodes: Set<number> | undefined
   let args: Array<string>
@@ -195,6 +198,7 @@ export async function getWorkingDirectoryDiff(
     file,
     diffText,
     'HEAD',
+    previousCommitish,
     lineEndingsChange
   )
 }
@@ -263,7 +267,8 @@ async function getSketchDiff(
   file: FileChange,
   diff: IRawDiff,
   kactusFile: IKactusFile,
-  commitish: string
+  commitish: string,
+  previousCommitish?: string
 ): Promise<ISketchDiff> {
   let current: Image | undefined = undefined
   let previous: Image | undefined = undefined
@@ -360,7 +365,7 @@ async function getSketchDiff(
           kactusFile,
           repository,
           file.oldPath || file.path,
-          `${commitish}`,
+          previousCommitish || `${commitish}`,
           type
         )
       } catch (e) {
@@ -387,6 +392,7 @@ export async function convertDiff(
   file: FileChange,
   diff: IRawDiff,
   commitish: string,
+  previousCommitish?: string,
   lineEndingsChange?: LineEndingsChange
 ): Promise<IDiff> {
   if (diff.isBinary) {
@@ -411,7 +417,8 @@ export async function convertDiff(
       file,
       diff,
       kactusFile,
-      commitish
+      commitish,
+      previousCommitish
     )
   }