* Applied changes from decap PR for non-index files decaporg/decap-cm…

…s#6498
Net-Slayer · Dec 8, 2023 · fae2a10 · fae2a10
1 parent 13f42e0
commit fae2a10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/packages/core/src/components/collections/NestedCollection.tsx b/packages/core/src/components/collections/NestedCollection.tsx
@@ -83,7 +83,8 @@ const TreeNode = ({
  return (
  <>
  {sortedData.map(node => {
- const leaf = node.children.length <= 1 && !node.children[0]?.isDir && depth > 0;
+ // const leaf = node.children.length <= 1 && !node.children[0]?.isDir && depth > 0;
+ const leaf = node.children.length === 0 && depth > 0;
  if (leaf) {
  return null;
  }
@@ -93,8 +94,8 @@ const TreeNode = ({
  }
  const title = getNodeTitle(node);
 
- const hasChildren = depth === 0 || node.children.some(c => c.children.some(c => c.isDir));
-
+ // const hasChildren = depth === 0 || node.children.some(c => c.children.some(c => c.isDir));
+ const hasChildren = depth === 0 || node.children.some(c => c.isDir);
  return (
  <Fragment key={node.path}>
  <div

diff --git a/packages/core/src/components/collections/entries/EntriesCollection.tsx b/packages/core/src/components/collections/entries/EntriesCollection.tsx
@@ -38,20 +38,22 @@ function getGroupTitle(group: GroupOfEntries, t: t) {
 
 export function filterNestedEntries(path: string, collectionFolder: string, entries: Entry[]) {
  const filtered = entries.filter(e => {
- const entryPath = e.path.slice(collectionFolder.length + 1);
+ let entryPath = e.path.slice(collectionFolder.length + 1);
  if (!entryPath.startsWith(path)) {
  return false;
  }
 
  // only show immediate children
  if (path) {
- // non root path
- const trimmed = entryPath.slice(path.length + 1);
- return trimmed.split('/').length === 2;
- } else {
- // root path
- return entryPath.split('/').length <= 2;
+ // // non root path
+ // const trimmed = entryPath.slice(path.length + 1);
+ // return trimmed.split('/').length === 2;
+ // } else {
+ // // root path
+ // return entryPath.split('/').length <= 2;
+ entryPath = entryPath.slice(path.length + 1);
  }
+ return !entryPath.includes('/');
  });
  return filtered;
 }