Merge pull request #47 from kactus-io/group-files

Group files

Author: mathieudutour

app/src/lib/app-state.ts

@@ -10,6 +10,7 @@ import {
   FileChange,
   WorkingDirectoryStatus,
   WorkingDirectoryFileChange,
+  FileType,
 } from '../models/status'
 import { CloningRepository, IGitHubUser, SignInState } from './dispatcher'
 import { ICommitMessage } from './dispatcher/git-store'
@@ -511,6 +512,8 @@ export interface IHistoryState {
   readonly changedFiles: ReadonlyArray<FileChange>
 
   readonly diff: IDiff | null
+
+  readonly loadingDiff: boolean
 }
 
 export interface IKactusState {
@@ -545,4 +548,11 @@ export interface IChangesState {
 
   /** The commit message for a work-in-progress commit in the changes view. */
   readonly commitMessage: ICommitMessage | null
+
+  readonly loadingDiff: boolean
+
+  readonly selectedSketchPart: {
+    id: string
+    type: FileType.LayerFile | FileType.PageFile
+  } | null
 }

app/src/lib/dispatcher/app-store.ts

@@ -27,8 +27,14 @@ import {
   FileChange,
   WorkingDirectoryStatus,
   WorkingDirectoryFileChange,
+  TSketchPartChange,
 } from '../../models/status'
-import { DiffSelection, DiffSelectionType, DiffType } from '../../models/diff'
+import {
+  DiffSelection,
+  DiffSelectionType,
+  DiffType,
+  IDiff,
+} from '../../models/diff'
 import { matchGitHubRepository } from '../../lib/repository-matching'
 import {
   API,
@@ -89,6 +95,7 @@ import {
   deleteBranch,
   getCommitDiff,
   getWorkingDirectoryDiff,
+  getWorkingDirectoryPartDiff,
   getChangedFiles,
   updateRef,
   addRemote,
@@ -396,6 +403,7 @@ export class AppStore {
         changedFiles: new Array<FileChange>(),
         history: new Array<string>(),
         diff: null,
+        loadingDiff: false,
       },
       changesState: {
         workingDirectory: WorkingDirectoryStatus.fromFiles(
@@ -405,6 +413,8 @@ export class AppStore {
         diff: null,
         contextualCommitMessage: null,
         commitMessage: null,
+        loadingDiff: false,
+        selectedSketchPart: null,
       },
       kactus: {
         files: new Array<IKactusFile & {}>(),
@@ -679,7 +689,7 @@ export class AppStore {
 
     const gitStore = this.getGitStore(repository)
     const changedFiles = await gitStore.performFailableOperation(() =>
-      getChangedFiles(repository, currentSHA)
+      getChangedFiles(repository, state.kactus.files, currentSHA)
     )
     if (!changedFiles) {
       return
@@ -740,15 +750,18 @@ export class AppStore {
   ): Promise<void> {
     this.updateHistoryState(repository, state => {
       const selection = { sha: state.selection.sha, file }
-      const diff = null
-      return { selection, diff }
+      return { selection, loadingDiff: true }
     })
     this.emitUpdate()
 
     const stateBeforeLoad = this.getRepositoryState(repository)
     const sha = stateBeforeLoad.historyState.selection.sha
 
     if (!sha) {
+      this.updateHistoryState(repository, state => {
+        return { loadingDiff: false }
+      })
+      this.emitUpdate()
       if (__DEV__) {
         throw new Error(
           "No currently selected sha yet we've been asked to switch file selection"
@@ -787,7 +800,7 @@ export class AppStore {
 
     this.updateHistoryState(repository, state => {
       const selection = { sha: state.selection.sha, file }
-      return { selection, diff }
+      return { selection, diff, loadingDiff: false }
     })
 
     this.emitUpdate()
@@ -1086,7 +1099,7 @@ export class AppStore {
     }
 
     const gitStore = this.getGitStore(repository)
-    const status = await gitStore.loadStatus()
+    const status = await gitStore.loadStatus(kactusStatus.files)
 
     if (!status) {
       this.updateRepositoryState(repository, state => {
@@ -1174,7 +1187,7 @@ export class AppStore {
   ): Promise<void> {
     this.updateChangesState(repository, state => ({
       selectedFileID: selectedFile ? selectedFile.id : null,
-      diff: null,
+      selectedSketchPart: null,
     }))
     this.updateKactusState(repository, state => ({ selectedFileID: null }))
     this.emitUpdate()
@@ -1227,7 +1240,31 @@ export class AppStore {
     this.updateKactusState(repository, state => ({
       selectedFileID: selectedFile ? selectedFile.id : null,
     }))
-    this.updateChangesState(repository, state => ({ selectedFileID: null }))
+    this.updateChangesState(repository, state => ({
+      selectedFileID: null,
+      selectedSketchPart: null,
+      diff: null,
+    }))
+    this.emitUpdate()
+
+    this.updateChangesDiffForCurrentSelection(repository)
+  }
+
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _changeSketchPartSelection(
+    repository: Repository,
+    selectedPart: TSketchPartChange | null
+  ): Promise<void> {
+    this.updateChangesState(repository, state => ({
+      selectedFileID: null,
+      selectedSketchPart: selectedPart
+        ? {
+            id: selectedPart.id,
+            type: selectedPart.type,
+          }
+        : null,
+    }))
+    this.updateKactusState(repository, state => ({ selectedFileID: null }))
     this.emitUpdate()
 
     this.updateChangesDiffForCurrentSelection(repository)
@@ -1241,75 +1278,113 @@ export class AppStore {
   private async updateChangesDiffForCurrentSelection(
     repository: Repository
   ): Promise<void> {
+    this.updateChangesState(repository, state => ({ loadingDiff: true }))
+    this.emitUpdate()
+
     const stateBeforeLoad = this.getRepositoryState(repository)
     const changesStateBeforeLoad = stateBeforeLoad.changesState
     const selectedFileIDBeforeLoad = changesStateBeforeLoad.selectedFileID
-    if (!selectedFileIDBeforeLoad) {
-      return
-    }
+    const selectedSketchPartBeforeLoad =
+      changesStateBeforeLoad.selectedSketchPart
 
-    const selectedFileBeforeLoad = changesStateBeforeLoad.workingDirectory.findFileWithID(
-      selectedFileIDBeforeLoad
-    )
-    if (!selectedFileBeforeLoad) {
+    let diff: IDiff
+
+    if (selectedFileIDBeforeLoad) {
+      const selectedFileBeforeLoad = changesStateBeforeLoad.workingDirectory.findFileWithID(
+        selectedFileIDBeforeLoad
+      )
+      if (!selectedFileBeforeLoad) {
+        this.updateChangesState(repository, state => ({ loadingDiff: false }))
+        this.emitUpdate()
+        return
+      }
+
+      diff = await getWorkingDirectoryDiff(
+        this.sketchPath,
+        repository,
+        stateBeforeLoad.kactus.files,
+        selectedFileBeforeLoad,
+        stateBeforeLoad.historyState.history[0]
+      )
+    } else if (selectedSketchPartBeforeLoad) {
+      diff = await getWorkingDirectoryPartDiff(
+        this.sketchPath,
+        repository,
+        stateBeforeLoad.kactus.files,
+        selectedSketchPartBeforeLoad,
+        stateBeforeLoad.historyState.history[0]
+      )
+    } else {
+      this.updateChangesState(repository, state => ({ loadingDiff: false }))
+      this.emitUpdate()
       return
     }
 
-    const diff = await getWorkingDirectoryDiff(
-      this.sketchPath,
-      repository,
-      stateBeforeLoad.kactus.files,
-      selectedFileBeforeLoad,
-      stateBeforeLoad.historyState.history[0]
-    )
-
     const stateAfterLoad = this.getRepositoryState(repository)
     const changesState = stateAfterLoad.changesState
     const selectedFileID = changesState.selectedFileID
+    const selectedSketchPart = changesState.selectedSketchPart
 
     // A different file could have been selected while we were loading the diff
     // in which case we no longer care about the diff we just loaded.
-    if (!selectedFileID) {
-      return
-    }
-    if (selectedFileID !== selectedFileIDBeforeLoad) {
+    if (
+      (!selectedFileID || selectedFileID !== selectedFileIDBeforeLoad) &&
+      (!selectedSketchPart ||
+        selectedSketchPart !== selectedSketchPartBeforeLoad)
+    ) {
+      this.updateChangesState(repository, state => ({ loadingDiff: false }))
+      this.emitUpdate()
       return
     }
 
-    const currentlySelectedFile = changesState.workingDirectory.findFileWithID(
-      selectedFileID
-    )
-    if (!currentlySelectedFile) {
-      return
-    }
+    if (selectedFileID) {
+      const currentlySelectedFile = changesState.workingDirectory.findFileWithID(
+        selectedFileID
+      )
+      if (!currentlySelectedFile) {
+        this.updateChangesState(repository, state => ({ loadingDiff: false }))
+        this.emitUpdate()
+        return
+      }
 
-    const selectableLines = new Set<number>()
-    if (diff.kind === DiffType.Text) {
-      // The diff might have changed dramatically since last we loaded it.
-      // Ideally we would be more clever about validating that any partial
-      // selection state is still valid by ensuring that selected lines still
-      // exist but for now we'll settle on just updating the selectable lines
-      // such that any previously selected line which now no longer exists or
-      // has been turned into a context line isn't still selected.
-      diff.hunks.forEach(h => {
-        h.lines.forEach((line, index) => {
-          if (line.isIncludeableLine()) {
-            selectableLines.add(h.unifiedDiffStart + index)
-          }
+      const selectableLines = new Set<number>()
+      if (diff.kind === DiffType.Text) {
+        // The diff might have changed dramatically since last we loaded it.
+        // Ideally we would be more clever about validating that any partial
+        // selection state is still valid by ensuring that selected lines still
+        // exist but for now we'll settle on just updating the selectable lines
+        // such that any previously selected line which now no longer exists or
+        // has been turned into a context line isn't still selected.
+        diff.hunks.forEach(h => {
+          h.lines.forEach((line, index) => {
+            if (line.isIncludeableLine()) {
+              selectableLines.add(h.unifiedDiffStart + index)
+            }
+          })
         })
-      })
-    }
+      }
 
-    const newSelection = currentlySelectedFile.selection.withSelectableLines(
-      selectableLines
-    )
-    const selectedFile = currentlySelectedFile.withSelection(newSelection)
-    const updatedFiles = changesState.workingDirectory.files.map(
-      f => (f.id === selectedFile.id ? selectedFile : f)
-    )
-    const workingDirectory = WorkingDirectoryStatus.fromFiles(updatedFiles)
+      const newSelection = currentlySelectedFile.selection.withSelectableLines(
+        selectableLines
+      )
+      const selectedFile = currentlySelectedFile.withSelection(newSelection)
+      const updatedFiles = changesState.workingDirectory.files.map(
+        f => (f.id === selectedFile.id ? selectedFile : f)
+      )
+      const workingDirectory = WorkingDirectoryStatus.fromFiles(updatedFiles)
+
+      this.updateChangesState(repository, state => ({
+        diff,
+        workingDirectory,
+        loadingDiff: false,
+      }))
+    } else {
+      this.updateChangesState(repository, state => ({
+        diff,
+        loadingDiff: false,
+      }))
+    }
 
-    this.updateChangesState(repository, state => ({ diff, workingDirectory }))
     this.emitUpdate()
   }
 

app/src/lib/dispatcher/dispatcher.ts

@@ -5,7 +5,11 @@ import { Disposable } from 'event-kit'
 
 import { Account } from '../../models/account'
 import { Repository } from '../../models/repository'
-import { WorkingDirectoryFileChange, FileChange } from '../../models/status'
+import {
+  WorkingDirectoryFileChange,
+  FileChange,
+  TSketchPartChange,
+} from '../../models/status'
 import { DiffSelection } from '../../models/diff'
 import {
   RepositorySection,
@@ -212,6 +216,14 @@ export class Dispatcher {
     return this.appStore._changeChangesSelection(repository, selectedFile)
   }
 
+  /** Change the currently selected sketch part in CHanges. */
+  public changeSketchPartSelection(
+    repository: Repository,
+    selectedPart: TSketchPartChange
+  ): Promise<void> {
+    return this.appStore._changeSketchPartSelection(repository, selectedPart)
+  }
+
   /**
    * Commit the changes which were marked for inclusion, using the given commit
    * summary and description.

app/src/lib/dispatcher/git-store.ts

@@ -14,6 +14,7 @@ import { ErrorWithMetadata, IErrorMetadata } from '../error-with-metadata'
 import { structuralEquals } from '../../lib/equality'
 import { compare } from '../../lib/compare'
 import { queueWorkHigh } from '../../lib/queue-work'
+import { IKactusFile } from '../../lib/kactus'
 
 import {
   reset,
@@ -587,9 +588,11 @@ export class GitStore {
     this.emitUpdate()
   }
 
-  public async loadStatus(): Promise<IStatusResult | null> {
+  public async loadStatus(
+    sketchFiles: ReadonlyArray<IKactusFile>
+  ): Promise<IStatusResult | null> {
     const status = await this.performFailableOperation(() =>
-      getStatus(this.repository)
+      getStatus(this.repository, sketchFiles)
     )
 
     if (!status) {