Merge "Add ported drafts to comment count string"

polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts

@@ -613,10 +613,7 @@ export class GrFileList extends KeyboardShortcutMixin(
     return changeComments.computeCommentsString(patchRange, file.__path, file);
   }
 
-  /**
-   * Computes a string with the number of drafts.
-   */
-  _computeDraftsString(
+  _computeDraftCount(
     changeComments?: ChangeComments,
     patchRange?: PatchRange,
     path?: string
@@ -628,7 +625,7 @@ export class GrFileList extends KeyboardShortcutMixin(
     ) {
       return '';
     }
-    const draftCount =
+    return (
       changeComments.computeDraftCount({
         patchNum: patchRange.basePatchNum,
         path,
@@ -636,7 +633,31 @@ export class GrFileList extends KeyboardShortcutMixin(
       changeComments.computeDraftCount({
         patchNum: patchRange.patchNum,
         path,
-      });
+      }) +
+      changeComments.computePortedDraftCount(
+        {
+          patchNum: patchRange.patchNum,
+          basePatchNum: patchRange.basePatchNum,
+        },
+        path
+      )
+    );
+  }
+
+  /**
+   * Computes a string with the number of drafts.
+   */
+  _computeDraftsString(
+    changeComments?: ChangeComments,
+    patchRange?: PatchRange,
+    path?: string
+  ) {
+    const draftCount = this._computeDraftCount(
+      changeComments,
+      patchRange,
+      path
+    );
+    if (draftCount === '') return draftCount;
     return pluralize(draftCount, 'draft');
   }
 
@@ -648,22 +669,11 @@ export class GrFileList extends KeyboardShortcutMixin(
     patchRange?: PatchRange,
     path?: string
   ) {
-    if (
-      changeComments === undefined ||
-      patchRange === undefined ||
-      path === undefined
-    ) {
-      return '';
-    }
-    const draftCount =
-      changeComments.computeDraftCount({
-        patchNum: patchRange.basePatchNum,
-        path,
-      }) +
-      changeComments.computeDraftCount({
-        patchNum: patchRange.patchNum,
-        path,
-      });
+    const draftCount = this._computeDraftCount(
+      changeComments,
+      patchRange,
+      path
+    );
     return draftCount === 0 ? '' : `${draftCount}d`;
   }
 

polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts

@@ -497,6 +497,13 @@ export class ChangeComments {
     return this._commentObjToArray(allDrafts).length;
   }
 
+  // TODO(dhruvsri): merge with computeDraftCount
+  computePortedDraftCount(patchRange: PatchRange, path: string) {
+    const threads = this.getThreadsBySideForFile({path}, patchRange);
+    return threads.filter(thread => isDraftThread(thread) && thread.ported)
+      .length;
+  }
+
   /**
    * @param includeUnmodified Included unmodified status of the file in the
    * comment string or not. For files we opt of chip instead of a string.