#400: Fix for draft/published grouping

CHANGELOG.md

@@ -32,6 +32,7 @@
 - [#393](https://github.com/estruyf/vscode-front-matter/issues/393): Fix Windows file path for retrieving the preview path
 - [#396](https://github.com/estruyf/vscode-front-matter/issues/396): Fix for `index` and `_index` page previews
 - [#398](https://github.com/estruyf/vscode-front-matter/issues/398): Fix Windows folder path parsing in data folder retrieval
+- [#400](https://github.com/estruyf/vscode-front-matter/issues/400): Fix for draft/published content grouping
 
 ## [8.0.1] - 2022-07-13
 

src/dashboardWebView/components/Contents/Overview.tsx

@@ -1,6 +1,7 @@
 import { Disclosure } from '@headlessui/react';
 import {ChevronRightIcon} from '@heroicons/react/solid';
 import * as React from 'react';
+import { useCallback } from 'react';
 import { useRecoilValue } from 'recoil';
 import { groupBy } from '../../../helpers/GroupBy';
 import { FrontMatterIcon } from '../../../panelWebView/components/Icons/FrontMatterIcon';
@@ -19,6 +20,14 @@ export interface IOverviewProps {
 export const Overview: React.FunctionComponent<IOverviewProps> = ({pages, settings}: React.PropsWithChildren<IOverviewProps>) => {
   const grouping = useRecoilValue(GroupingSelector);
 
+  const groupName = useCallback((groupId, groupedPages) => {
+    if (grouping === GroupOption.Draft) {
+      return `${groupId} (${groupedPages[groupId].length})`;
+    }
+
+    return `${GroupOption[grouping]}: ${groupId} (${groupedPages[groupId].length})`;
+  }, [grouping])
+
   if (!pages || !pages.length) {
     return (
       <div className={`flex items-center justify-center h-full`}>
@@ -58,7 +67,7 @@ export const Overview: React.FunctionComponent<IOverviewProps> = ({pages, settin
                       <ChevronRightIcon
                         className={`w-8 h-8 mr-1 ${open ? "transform rotate-90" : ""}`}
                       />
-                      {GroupOption[grouping]}: {groupId} ({groupedPages[groupId].length})
+                      { groupName(groupId, groupedPages) }
                     </h2>
                   </Disclosure.Button>
                   

src/helpers/ContentType.ts

@@ -48,7 +48,7 @@ export class ContentType {
       fieldValue = data[draftSetting.name];
     }
 
-    if (draftSetting && fieldValue) {
+    if (draftSetting && fieldValue !== null) {
       if (draftSetting.type === "boolean") {
         return fieldValue ? "Draft" : "Published";
       } else {