Added commit hash handling

Author: sn2912

src/views/nodes/directoryNode.ts

@@ -3,7 +3,6 @@ import { PRDirectory } from '../pullrequest/diffViewHelper';
 import { AbstractBaseNode } from './abstractBaseNode';
 import { PullRequestFilesNode } from './pullRequestFilesNode';
 import { Container } from 'src/container';
-import { Logger } from 'src/logger';
 import { PullRequest } from 'src/bitbucket/model';
 import * as crypto from 'crypto';
 
@@ -13,6 +12,7 @@ export class DirectoryNode extends AbstractBaseNode {
         private directoryData: PRDirectory,
         private section: 'files' | 'commits' = 'files',
         private pr: PullRequest,
+        private commitHash?: string,
     ) {
         super();
     }
@@ -29,7 +29,7 @@ export class DirectoryNode extends AbstractBaseNode {
 
         const dirId =
             this.section === 'commits'
-                ? `repo-${repoId}-pr-${prId}-section-${this.section}-commit-${this.pr.data.source.commitHash}-directory-${dirPath}`
+                ? `repo-${repoId}-pr-${prId}-section-${this.section}-commit-${this.commitHash}-directory-${dirPath}`
                 : `repo-${repoId}-pr-${prId}-section-${this.section}-directory-${dirPath}`;
         return crypto.createHash('md5').update(dirId).digest('hex');
     }
@@ -56,10 +56,8 @@ export class DirectoryNode extends AbstractBaseNode {
 
         try {
             this._isDirectClick = true;
-            Logger.debug(`Setting directory ${this.directoryId} checked state to ${value}`);
             Container.checkboxStateManager.setChecked(this.directoryId, value);
 
-            Logger.debug('Propagating state to children');
             this.directoryData.files.forEach((file) => {
                 const fileNode = new PullRequestFilesNode(file, this.section, this.pr);
                 Container.checkboxStateManager.setChecked(fileNode.fileId, value);
@@ -106,8 +104,6 @@ export class DirectoryNode extends AbstractBaseNode {
             item.contextValue = `directory${allChecked ? '.checked' : ''}`;
         }
 
-        Logger.debug('directoryId', this.directoryId);
-
         if (!this.isRootFilesDirectory) {
             item.id = this.directoryId;
         }

src/views/nodes/pullRequestFilesNode.ts

@@ -16,6 +16,7 @@ export class PullRequestFilesNode extends AbstractBaseNode {
         private diffViewData: DiffViewArgs,
         private section: 'files' | 'commits' = 'files',
         private pr: PullRequest,
+        private commitHash?: string,
     ) {
         super();
     }
@@ -27,7 +28,7 @@ export class PullRequestFilesNode extends AbstractBaseNode {
 
         const fileId =
             this.section === 'commits'
-                ? `repo-${repoId}-pr-${this.pr.data.id}-section-${this.section}-commit-${this.pr.data.source.commitHash}-file-${this.diffViewData.fileDisplayData.fileDisplayName}-${this.diffViewData.latestFileContentHash}`
+                ? `repo-${repoId}-pr-${this.pr.data.id}-section-${this.section}-commit-${this.commitHash}-file-${this.diffViewData.fileDisplayData.fileDisplayName}-${this.diffViewData.latestFileContentHash}`
                 : `repo-${repoId}-pr-${this.pr.data.id}-section-${this.section}-file-${this.diffViewData.fileDisplayData.fileDisplayName}-${this.diffViewData.latestFileContentHash}`;
         return crypto.createHash('md5').update(fileId).digest('hex');
     }

src/views/pullrequest/diffViewHelper.ts

@@ -116,7 +116,6 @@ export async function getArgsForDiffView(
     const rhsFilePath = fileDiff.newPath;
 
     let fileDisplayName = getFileNameFromPaths(lhsFilePath, rhsFilePath);
-    Logger.debug('lhsFilePath', lhsFilePath, fileDisplayName);
     const comments: Comment[][] = [];
     const commentsMap = getInlineComments(allComments.data);
 
@@ -305,10 +304,10 @@ export async function createFileChangesNodes(
 
         const directoryNodes: DirectoryNode[] = Array.from(
             rootDirectory.subdirs.values(),
-            (subdir) => new DirectoryNode(subdir, section, pr),
+            (subdir) => new DirectoryNode(subdir, section, pr, commitRange?.rhs),
         );
         const childNodes: AbstractBaseNode[] = rootDirectory.files.map(
-            (diffViewArg) => new PullRequestFilesNode(diffViewArg, section, pr),
+            (diffViewArg) => new PullRequestFilesNode(diffViewArg, section, pr, commitRange?.rhs),
         );
         return childNodes.concat(directoryNodes);
     }