use FolderNode

gitkraken · Jan 2, 2019 · e6146c2 · e6146c2
1 parent d314bb4
commit e6146c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/views/nodes.ts b/src/views/nodes.ts
@@ -8,6 +8,7 @@ export * from './nodes/commitFileNode';
 export * from './nodes/commitNode';
 export * from './nodes/fileHistoryNode';
 export * from './nodes/fileHistoryTrackerNode';
+export * from './nodes/folderNode';
 export * from './nodes/lineHistoryNode';
 export * from './nodes/lineHistoryTrackerNode';
 export * from './nodes/remoteNode';

diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts
@@ -23,6 +23,7 @@ import {
     canDismissNode,
     CommitFileNode,
     CommitNode,
+    FolderNode,
     RemoteNode,
     RepositoryNode,
     ResultsFileNode,
@@ -466,10 +467,10 @@ export class ViewCommands implements Disposable {
         return;
     }
 
-    private async stageDirectory(node: ViewNode) {
-        if (!node.uri.repoPath) return;
+    private async stageDirectory(node: FolderNode) {
+        if (!(node instanceof FolderNode) || !node.relativePath) return;
 
-        void (await Container.git.stageDirectory(node.uri.repoPath, node.uri));
+        void (await Container.git.stageDirectory(node.repoPath, node.relativePath));
     }
 
     private async stageFile(node: CommitFileNode | StatusFileNode) {
@@ -478,10 +479,10 @@ export class ViewCommands implements Disposable {
         void (await Container.git.stageFile(node.repoPath, node.file.fileName));
     }
 
-    private async unstageDirectory(node: ViewNode) {
-        if (!node.uri.repoPath) return;
+    private async unstageDirectory(node: FolderNode) {
+        if (!(node instanceof FolderNode) || !node.relativePath) return;
 
-        void (await Container.git.unStageDirectory(node.uri.repoPath, node.uri));
+        void (await Container.git.unStageDirectory(node.repoPath, node.relativePath));
     }
 
     private async unstageFile(node: CommitFileNode | StatusFileNode) {